Skip to content

Commit 700319b

Browse files
goekaygoekay
committed
present transaction "stop reason" on web ui
1 parent 62294c2 commit 700319b

4 files changed

Lines changed: 21 additions & 12 deletions

File tree

‎src/main/java/de/rwth/idsg/steve/repository/dto/Transaction.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,7 @@ public final class Transaction {
1616
private final String chargeBoxId, ocppIdTag, startTimestamp, startValue, stopTimestamp, stopValue;
1717
private final DateTime startTimestampDT;
1818
private final DateTime stopTimestampDT;
19+
20+
// new in OCPP 1.6
21+
private final String stopReason;
1922
}

‎src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import org.jooq.Condition;
1313
import org.jooq.DSLContext;
1414
import org.jooq.Field;
15-
import org.jooq.Record10;
16-
import org.jooq.Record8;
15+
import org.jooq.Record11;
16+
import org.jooq.Record9;
1717
import org.jooq.RecordMapper;
1818
import org.jooq.SelectQuery;
1919
import org.jooq.Table;
@@ -77,7 +77,7 @@ public TransactionDetails getDetails(int transactionPk) {
7777
form.setType(TransactionQueryForm.QueryType.ALL);
7878
form.setPeriodType(TransactionQueryForm.QueryPeriodType.ALL);
7979

80-
Record10<Integer, String, Integer, String, DateTime, String, DateTime, String, Integer, Integer>
80+
Record11<Integer, String, Integer, String, DateTime, String, DateTime, String, String, Integer, Integer>
8181
transaction = getInternal(form).fetchOne();
8282

8383
if (transaction == null) {
@@ -177,7 +177,7 @@ public TransactionDetails getDetails(int transactionPk) {
177177

178178
@SuppressWarnings("unchecked")
179179
private
180-
SelectQuery<Record8<Integer, String, Integer, String, DateTime, String, DateTime, String>>
180+
SelectQuery<Record9<Integer, String, Integer, String, DateTime, String, DateTime, String, String>>
181181
getInternalCSV(TransactionQueryForm form) {
182182

183183
SelectQuery selectQuery = ctx.selectQuery();
@@ -191,7 +191,8 @@ public TransactionDetails getDetails(int transactionPk) {
191191
TRANSACTION.START_TIMESTAMP,
192192
TRANSACTION.START_VALUE,
193193
TRANSACTION.STOP_TIMESTAMP,
194-
TRANSACTION.STOP_VALUE
194+
TRANSACTION.STOP_VALUE,
195+
TRANSACTION.STOP_REASON
195196
);
196197

197198
return addConditions(selectQuery, form);
@@ -203,7 +204,7 @@ public TransactionDetails getDetails(int transactionPk) {
203204
*/
204205
@SuppressWarnings("unchecked")
205206
private
206-
SelectQuery<Record10<Integer, String, Integer, String, DateTime, String, DateTime, String, Integer, Integer>>
207+
SelectQuery<Record11<Integer, String, Integer, String, DateTime, String, DateTime, String, String, Integer, Integer>>
207208
getInternal(TransactionQueryForm form) {
208209

209210
SelectQuery selectQuery = ctx.selectQuery();
@@ -220,6 +221,7 @@ public TransactionDetails getDetails(int transactionPk) {
220221
TRANSACTION.START_VALUE,
221222
TRANSACTION.STOP_TIMESTAMP,
222223
TRANSACTION.STOP_VALUE,
224+
TRANSACTION.STOP_REASON,
223225
CHARGE_BOX.CHARGE_BOX_PK,
224226
OCPP_TAG.OCPP_TAG_PK
225227
);
@@ -288,11 +290,11 @@ private void processType(SelectQuery selectQuery, TransactionQueryForm form) {
288290
}
289291

290292
private static class TransactionMapper
291-
implements RecordMapper<Record10<Integer, String, Integer, String, DateTime, String, DateTime,
292-
String, Integer, Integer>, Transaction> {
293+
implements RecordMapper<Record11<Integer, String, Integer, String, DateTime, String, DateTime,
294+
String, String, Integer, Integer>, Transaction> {
293295
@Override
294-
public Transaction map(Record10<Integer, String, Integer, String, DateTime, String, DateTime,
295-
String, Integer, Integer> r) {
296+
public Transaction map(Record11<Integer, String, Integer, String, DateTime, String, DateTime,
297+
String, String, Integer, Integer> r) {
296298
return Transaction.builder()
297299
.id(r.value1())
298300
.chargeBoxId(r.value2())
@@ -304,8 +306,9 @@ public Transaction map(Record10<Integer, String, Integer, String, DateTime, Stri
304306
.stopTimestampDT(r.value7())
305307
.stopTimestamp(DateTimeUtils.humanize(r.value7()))
306308
.stopValue(r.value8())
307-
.chargeBoxPk(r.value9())
308-
.ocppTagPk(r.value10())
309+
.stopReason(r.value9())
310+
.chargeBoxPk(r.value10())
311+
.ocppTagPk(r.value11())
309312
.build();
310313
}
311314
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<tr><td>Start Value</td><td>${details.transaction.startValue}</td></tr>
1717
<tr><td>Stop Date/Time</td><td>${details.transaction.stopTimestamp}</td></tr>
1818
<tr><td>Stop Value</td><td>${details.transaction.stopValue}</td></tr>
19+
<tr><td>Stop Reason</td><td>${details.transaction.stopReason}</td></tr>
1920
</table>
2021
</center>
2122
<br>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ Transactions
8484
<th data-sort="int">Start Value</th>
8585
<th data-sort="date">Stop Date/Time</th>
8686
<th data-sort="int">Stop Value</th>
87+
<th data-sort="string">Stop Reason</th>
8788
</tr>
8889
</thead>
8990
<tbody>
@@ -97,6 +98,7 @@ Transactions
9798
<td>${ta.startValue}</td>
9899
<td data-sort-value="${ta.stopTimestampDT.millis}">${ta.stopTimestamp}</td>
99100
<td>${ta.stopValue}</td>
101+
<td>${ta.stopReason}</td>
100102
</tr>
101103
</c:forEach>
102104
</tbody>

0 commit comments

Comments
 (0)