Skip to content

Commit 3260988

Browse files
goekaygoekay
committed
update charge point and ocpp tag pages
reason: include shortcuts/links to transactions and reservations
1 parent 20c961e commit 3260988

3 files changed

Lines changed: 71 additions & 23 deletions

File tree

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

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,43 @@
11
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
22
<table class="userInput">
3-
<tr>
4-
<td>ID Tag:</td>
5-
<td>
6-
<form:input path="idTag" readonly="${isUpdateForm}"/>
7-
<a class="tooltip" href="#"><img src="${ctxPath}/static/images/info.png" style="vertical-align:middle">
8-
<span>This field is set when adding an OCPP Tag, and cannot be changed later</span>
9-
</a>
10-
</td>
11-
</tr>
12-
<tr>
13-
<td>Parent ID Tag:</td>
14-
<td><form:select path="parentIdTag" items="${idTagList}"/></td>
15-
</tr>
16-
<tr><td>Expiry Date/Time:</td><td><form:input path="expiration" cssClass="dateTimePicker"/></td></tr>
17-
3+
<thead><tr><th>OCPP</th><th></th></thead>
4+
<tbody>
5+
<tr>
6+
<td>ID Tag:</td>
7+
<td>
8+
<form:input path="idTag" readonly="${isUpdateForm}"/>
9+
<a class="tooltip" href="#"><img src="${ctxPath}/static/images/info.png" style="vertical-align:middle">
10+
<span>This field is set when adding an OCPP Tag, and cannot be changed later</span>
11+
</a>
12+
</td>
13+
</tr>
14+
<tr>
15+
<td>Parent ID Tag:</td>
16+
<td><form:select path="parentIdTag" items="${idTagList}"/></td>
17+
</tr>
18+
<tr><td>Expiry Date/Time:</td><td><form:input path="expiration" cssClass="dateTimePicker"/></td></tr>
19+
<tr><td>Block the ID Tag:</td>
20+
<td><form:radiobutton path="blocked" value="false"/> false</td>
21+
</tr>
22+
<tr>
23+
<td></td>
24+
<td><form:radiobutton path="blocked" value="true"/> true</td>
25+
</tr>
26+
</tbody>
27+
</table>
28+
<table class="userInput">
29+
<thead><tr><th>Misc.</th><th></th></thead>
30+
<tbody>
1831
<%-- print inTransaction only when updating, otherwise unnecessary --%>
1932
<c:if test="${isUpdateForm}">
2033
<tr><td>In Transaction?:</td><td>${inTransaction}</td></tr>
2134
</c:if>
22-
23-
<tr><td>Block the ID Tag:</td>
24-
<td><form:radiobutton path="blocked" value="false"/> false</td>
25-
</tr>
26-
<tr>
27-
<td></td>
28-
<td><form:radiobutton path="blocked" value="true"/> true</td>
29-
</tr>
3035
<tr><td>Additional Note:</td><td><form:textarea path="note"/></td></tr>
3136
<tr><td></td>
3237
<td id="add_space">
3338
<input type="submit" name="${submitButtonName}" value="${submitButtonValue}">
3439
<input type="submit" name="backToOverview" value="Back to Overview">
3540
</td>
3641
</tr>
42+
</tbody>
3743
</table>

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,27 @@
1616
<span>Read-only fields are updated by the charge point.</span>
1717
</a>
1818
</span></section>
19+
20+
<table class="userInput">
21+
<thead><tr><th>See Operations</th><th></th></thead>
22+
<tbody>
23+
<tr>
24+
<td>Transactions:</td>
25+
<td>
26+
<a href="${ctxPath}/manager/transactions/query?chargeBoxId=${chargePointForm.chargeBoxId}&amp;type=ACTIVE">ACTIVE</a>
27+
/
28+
<a href="${ctxPath}/manager/transactions/query?chargeBoxId=${chargePointForm.chargeBoxId}&amp;type=ALL">ALL</a>
29+
</td>
30+
</tr>
31+
<tr>
32+
<td>Reservations:</td>
33+
<td>
34+
<a href="${ctxPath}/manager/reservations/query?chargeBoxId=${chargePointForm.chargeBoxId}&amp;periodType=ACTIVE">ACTIVE</a>
35+
</td>
36+
</tr>
37+
</tbody>
38+
</table>
39+
1940
<form:form action="${ctxPath}/manager/chargepoints/update" modelAttribute="chargePointForm">
2041

2142
<form:hidden path="chargeBoxPk" readonly="true"/>

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,27 @@
1616
</spring:hasBindErrors>
1717
<div class="content"><div>
1818
<section><span>OCPP Tag Details</span></section>
19+
20+
<table class="userInput">
21+
<thead><tr><th>See Operations</th><th></th></thead>
22+
<tbody>
23+
<tr>
24+
<td>Transactions:</td>
25+
<td>
26+
<a href="${ctxPath}/manager/transactions/query?ocppIdTag=${ocppTagForm.idTag}&amp;type=ACTIVE">ACTIVE</a>
27+
/
28+
<a href="${ctxPath}/manager/transactions/query?ocppIdTag=${ocppTagForm.idTag}&amp;type=ALL">ALL</a>
29+
</td>
30+
</tr>
31+
<tr>
32+
<td>Reservations:</td>
33+
<td>
34+
<a href="${ctxPath}/manager/reservations/query?ocppIdTag=${ocppTagForm.idTag}&amp;periodType=ACTIVE">ACTIVE</a>
35+
</td>
36+
</tr>
37+
</tbody>
38+
</table>
39+
1940
<form:form action="${ctxPath}/manager/ocppTags/update" modelAttribute="ocppTagForm">
2041

2142
<form:hidden path="ocppTagPk" readonly="true"/>

0 commit comments

Comments
 (0)