JavaIsJavaScript
diff --git a/‎src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java‎
Lines changed: 3 additions & 0 deletions b/‎src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java‎
Lines changed: 5 additions & 2 deletions b/‎src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎src/main/resources/webapp/WEB-INF/views/data-man/transactionDetails.jsp‎
Lines changed: 2 additions & 0 deletions b/‎src/main/resources/webapp/WEB-INF/views/data-man/transactionDetails.jsp‎
Lines changed: 2 additions & 0 deletions
@@ -22,5 +22,8 @@ public class TransactionDetails {
     public static class MeterValues {
         private final DateTime valueTimestamp;
         private final String value, readingContext, format, measurand, location, unit;
+
+        // New in OCPP 1.6
+        private final String phase;
     }
 }
@@ -147,15 +147,17 @@ public TransactionDetails getDetails(int transactionPk) {
                         t1.field(5, String.class),
                         t1.field(6, String.class),
                         t1.field(7, String.class),
-                        t1.field(8, String.class))
+                        t1.field(8, String.class),
+                        t1.field(9, String.class))
                    .from(t1)
                    .groupBy(
                            t1.field(3),
                            t1.field(4),
                            t1.field(5),
                            t1.field(6),
                            t1.field(7),
-                           t1.field(8))
+                           t1.field(8),
+                           t1.field(9))
                    .orderBy(dateTimeField)
                    .fetch()
                    .map(r -> TransactionDetails.MeterValues.builder()
@@ -166,6 +168,7 @@ public TransactionDetails getDetails(int transactionPk) {
                                                            .measurand(r.value5())
                                                            .location(r.value6())
                                                            .unit(r.value7())
+                                                           .phase(r.value8())
                                                            .build());
 
         return new TransactionDetails(new TransactionMapper().map(transaction), values);
 
@@ -31,6 +31,7 @@
             <th>Measurand</th>
             <th>Location</th>
             <th>Unit</th>
+            <th>Phase</th>
         </tr>
         </thead>
         <tbody>
@@ -43,6 +44,7 @@
                 <td>${v.measurand}</td>
                 <td>${v.location}</td>
                 <td>${v.unit}</td>
+                <td>${v.phase}</td>
             </tr>
         </c:forEach>
         </tbody>
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,8 @@ public class TransactionDetails {`
`22`	`22`	`public static class MeterValues {`
`23`	`23`	`private final DateTime valueTimestamp;`
`24`	`24`	`private final String value, readingContext, format, measurand, location, unit;`
	`25`	`+`
	`26`	`+ // New in OCPP 1.6`
	`27`	`+ private final String phase;`
`25`	`28`	`}`
`26`	`29`	`}`