ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-02-08 12:20:13 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Continued formating of the jsp

Browse Source
This commit is contained in:
Cyrus 2024-03-20 21:06:32 -04:00
parent 5a4d2e92af
commit 6308dad6ee
2 changed files with 47 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ComponentComparisonPageController.java
View File

@ -7,6 +7,7 @@ import hirs.attestationca.persist.entity.manager.PlatformCertificateRepository;
import hirs.attestationca.persist.entity.userdefined.certificate.ComponentResult; import hirs.attestationca.persist.entity.userdefined.certificate.ComponentResult;
import hirs.attestationca.persist.entity.userdefined.certificate.PlatformCredential; import hirs.attestationca.persist.entity.userdefined.certificate.PlatformCredential;
import hirs.attestationca.persist.entity.userdefined.certificate.attributes.ComponentAttributeResult; import hirs.attestationca.persist.entity.userdefined.certificate.attributes.ComponentAttributeResult;
import hirs.attestationca.persist.entity.userdefined.info.ComponentInfo;
import hirs.attestationca.persist.util.PciIds; import hirs.attestationca.persist.util.PciIds;
import hirs.attestationca.portal.page.Page; import hirs.attestationca.portal.page.Page;
import hirs.attestationca.portal.page.PageController; import hirs.attestationca.portal.page.PageController;
@ -153,9 +154,12 @@ public class ComponentComparisonPageController extends PageController<Certificat
if (PciIds.DB.isReady()) { if (PciIds.DB.isReady()) {
componentResults = PciIds.translateResults(componentResults); componentResults = PciIds.translateResults(componentResults);
} }
List<ComponentInfo> componentInfos = componentInfoRepository
.findByDeviceNameOrderByComponentClassAsc(deviceName);
data.put("componentResults", componentResults); data.put("componentResults", componentResults);
data.put("componentInfos", componentInfoRepository data.put("componentInfos", componentInfoRepository
.findByDeviceNameOrderByComponentClassAsc(deviceName)); .findByDeviceNameOrderByComponentClassAsc(deviceName));
data.put("totalSize", Math.max(componentResults.size(), componentInfos.size()));
} else { } else {
String notFoundMessage = "No components attribute comparison found " String notFoundMessage = "No components attribute comparison found "
+ "with ID: " + sessionId; + "with ID: " + sessionId;

47
HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/component-comparison.jsp
View File

@ -30,7 +30,10 @@
</div> </div>
</c:if> </c:if>
<c:if test="${not empty initialData.certificateId}"> <c:if test="${not empty initialData.certificateId}">
<div>Platform Certificate:&nbsp;<span><a href="${portal}/certificate-details?id=${initialData.certificateId}">${initialData.boardNumber}</a></span> <div>Platform Certificate:&nbsp;
<span>
<a href="${portal}/certificate-details?id=${initialData.certificateId}&type=platform">${initialData.boardNumber}</a>
</span>
</div> </div>
</c:if> </c:if>
</div> </div>
@ -39,41 +42,29 @@
<div class="row" style="margin: auto 260px auto 125px"> <div class="row" style="margin: auto 260px auto 125px">
<div class="panel panel-default" style="flex: 1"> <div class="panel panel-default" style="flex: 1">
<div class="panel-heading">Certificate Component</div> <div class="panel-heading">Certificate Component</div>
<c:if test="${not empty initialData.componentResults}">
<c:set var="iterator" value="0" scope="page"/>
<c:forEach items="${initialData.componentResults}" var="componentResult">
<div>
<div style="display: flex; background: lightgray;">
<div style="display: flex 1; font-weight: bold; margin: auto 1rem auto 1rem">Failed Event Digest:<br />
</div>
<div style="display: flex 2; margin: 2px auto 2px 25px">
<span class="mappedData">Manufacturer:</span> ${componentResult.getManufacturer()}<br />
<span class="mappedData">Model:</span> ${componentResult.getModel()}<br />
<span class="mappedData">Serial Number:</span> ${componentResult.getSerialNumber()}<br />
<span class="mappedData">Revision:</span> ${componentResult.getRevisionNumber()}<br />
</div>
</div> </div>
<div class="panel panel-default" style="flex: 2">
<div class="panel-heading">Device Components</div>
</div> </div>
<div style="display: flex;"> <div style="display: flex;">
<div class="mappedButton"> <c:forEach var = "i" begin = "1" end = "${totalSize}">
Expected Events from RIM DB:<br /> <div style="display: flex 1; margin: auto 1rem auto 1rem">
<span style="word-wrap: break-word"><a role="button" data-toggle="collapse" href="#eventContent${iterator}">${lEvent.getEventTypeString()}</a></span> <span class="mappedData">Manufacturer:</span> ${componentResults.get(i).getManufacturer()}<br />
<span class="mappedData">Model:</span> ${componentResults.get(i).getModel()}<br />
<span class="mappedData">Serial Number:</span> ${componentResults.get(i).getSerialNumber()}<br />
<span class="mappedData">Revision:</span> ${componentResults.get(i).getRevisionNumber()}<br />
</div>
<div style="display: flex 2; margin: 2px auto 2px 25px">
<span class="mappedData">Manufacturer:</span> ${componentInfos.get(i).getComponentManufacturer()}<br />
<span class="mappedData">Model:</span> ${componentInfos.get(i).getComponentModel()}<br />
<span class="mappedData">Serial Number:</span> ${componentInfos.get(i).getComponentSerial()}<br />
<span class="mappedData">Revision:</span> ${componentInfos.get(i).getComponentRevision()}<br />
</div> </div>
<div id="eventContent${iterator}" class="panel-collapse collapse in" style="flex: 2">
<c:forEach items="${initialData.componentInfos}" var="componentInfos">
<span class="mappedData">Manufacturer:</span> ${componentInfos.getComponentManufacturer()}<br />
<span class="mappedData">Model:</span> ${componentInfos.getComponentModel()}<br />
<span class="mappedData">Serial Number:</span> ${componentInfos.getComponentSerial()}<br />
<span class="mappedData">Revision:</span> ${componentInfos.getComponentRevision()}<br />
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<c:set var="iterator" value="${iterator+1}" scope="page"/>
</c:forEach>
</c:if>
</div> </div>
</div> </div>
</div> </div>
</div> </jsp:body>
</jsp:body>
</my:page> </my:page>