update charge point and ocpp tag pages

reason: include shortcuts/links to transactions and reservations

Author: goekay

src/main/resources/webapp/WEB-INF/views/data-man/00-ocppTag.jsp

@@ -1,37 +1,43 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <table class="userInput">
-	<tr>
-		<td>ID Tag:</td>
-		<td>
-			<form:input path="idTag" readonly="${isUpdateForm}"/>
-			<a class="tooltip" href="#"><img src="${ctxPath}/static/images/info.png" style="vertical-align:middle">
-				<span>This field is set when adding an OCPP Tag, and cannot be changed later</span>
-			</a>
-		</td>
-	</tr>
-	<tr>
-		<td>Parent ID Tag:</td>
-		<td><form:select path="parentIdTag" items="${idTagList}"/></td>
-	</tr>
-	<tr><td>Expiry Date/Time:</td><td><form:input path="expiration" cssClass="dateTimePicker"/></td></tr>
-
+	<thead><tr><th>OCPP</th><th></th></thead>
+	<tbody>
+		<tr>
+			<td>ID Tag:</td>
+			<td>
+				<form:input path="idTag" readonly="${isUpdateForm}"/>
+				<a class="tooltip" href="#"><img src="${ctxPath}/static/images/info.png" style="vertical-align:middle">
+					<span>This field is set when adding an OCPP Tag, and cannot be changed later</span>
+				</a>
+			</td>
+		</tr>
+		<tr>
+			<td>Parent ID Tag:</td>
+			<td><form:select path="parentIdTag" items="${idTagList}"/></td>
+		</tr>
+		<tr><td>Expiry Date/Time:</td><td><form:input path="expiration" cssClass="dateTimePicker"/></td></tr>
+		<tr><td>Block the ID Tag:</td>
+			<td><form:radiobutton path="blocked" value="false"/> false</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td><form:radiobutton path="blocked" value="true"/> true</td>
+		</tr>
+	</tbody>
+</table>
+<table class="userInput">
+	<thead><tr><th>Misc.</th><th></th></thead>
+	<tbody>
 	<%-- print inTransaction only when updating, otherwise unnecessary --%>
 	<c:if test="${isUpdateForm}">
 		<tr><td>In Transaction?:</td><td>${inTransaction}</td></tr>
 	</c:if>
-
-	<tr><td>Block the ID Tag:</td>
-		<td><form:radiobutton path="blocked" value="false"/> false</td>
-	</tr>
-	<tr>
-		<td></td>
-		<td><form:radiobutton path="blocked" value="true"/> true</td>
-	</tr>
 	<tr><td>Additional Note:</td><td><form:textarea path="note"/></td></tr>
 	<tr><td></td>
 		<td id="add_space">
 			<input type="submit" name="${submitButtonName}" value="${submitButtonValue}">
 			<input type="submit" name="backToOverview" value="Back to Overview">
 		</td>
 	</tr>
+	</tbody>
 </table>

src/main/resources/webapp/WEB-INF/views/data-man/chargepointDetails.jsp

@@ -16,6 +16,27 @@
             <span>Read-only fields are updated by the charge point.</span>
         </a>
     </span></section>
+
+        <table class="userInput">
+            <thead><tr><th>See Operations</th><th></th></thead>
+            <tbody>
+            <tr>
+                <td>Transactions:</td>
+                <td>
+                    <a href="${ctxPath}/manager/transactions/query?chargeBoxId=${chargePointForm.chargeBoxId}&amp;type=ACTIVE">ACTIVE</a>
+                     /
+                    <a href="${ctxPath}/manager/transactions/query?chargeBoxId=${chargePointForm.chargeBoxId}&amp;type=ALL">ALL</a>
+                </td>
+            </tr>
+            <tr>
+                <td>Reservations:</td>
+                <td>
+                    <a href="${ctxPath}/manager/reservations/query?chargeBoxId=${chargePointForm.chargeBoxId}&amp;periodType=ACTIVE">ACTIVE</a>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+
         <form:form action="${ctxPath}/manager/chargepoints/update" modelAttribute="chargePointForm">
 
             <form:hidden path="chargeBoxPk" readonly="true"/>

src/main/resources/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp

@@ -16,6 +16,27 @@
 </spring:hasBindErrors>
 <div class="content"><div>
     <section><span>OCPP Tag Details</span></section>
+
+    <table class="userInput">
+        <thead><tr><th>See Operations</th><th></th></thead>
+        <tbody>
+        <tr>
+            <td>Transactions:</td>
+            <td>
+                <a href="${ctxPath}/manager/transactions/query?ocppIdTag=${ocppTagForm.idTag}&amp;type=ACTIVE">ACTIVE</a>
+                /
+                <a href="${ctxPath}/manager/transactions/query?ocppIdTag=${ocppTagForm.idTag}&amp;type=ALL">ALL</a>
+            </td>
+        </tr>
+        <tr>
+            <td>Reservations:</td>
+            <td>
+                <a href="${ctxPath}/manager/reservations/query?ocppIdTag=${ocppTagForm.idTag}&amp;periodType=ACTIVE">ACTIVE</a>
+            </td>
+        </tr>
+        </tbody>
+    </table>
+
     <form:form action="${ctxPath}/manager/ocppTags/update" modelAttribute="ocppTagForm">
 
         <form:hidden path="ocppTagPk" readonly="true"/>