JavaIsJavaScript
diff --git a/‎src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java‎
Lines changed: 2 additions & 2 deletions b/‎src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java‎
Lines changed: 2 additions & 2 deletions b/‎src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java‎
Lines changed: 3 additions & 3 deletions b/‎src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/main/resources/webapp/WEB-INF/views/data-man/reservations.jsp‎
Lines changed: 13 additions & 2 deletions b/‎src/main/resources/webapp/WEB-INF/views/data-man/reservations.jsp‎
Lines changed: 13 additions & 2 deletions
diff --git a/‎src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp‎
Lines changed: 1 addition & 1 deletion b/‎src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp‎
Lines changed: 1 addition & 1 deletion
@@ -60,8 +60,8 @@ public List<Reservation> getReservations(ReservationQueryForm form) {
             selectQuery.addConditions(RESERVATION.CHARGE_BOX_ID.eq(form.getChargeBoxId()));
         }
 
-        if (form.isUserIdSet()) {
-            selectQuery.addConditions(RESERVATION.ID_TAG.eq(form.getUserId()));
+        if (form.isOcppIdTagSet()) {
+            selectQuery.addConditions(RESERVATION.ID_TAG.eq(form.getOcppIdTag()));
         }
 
         if (form.isStatusSet()) {
 
@@ -139,8 +139,8 @@ private SelectQuery addConditions(SelectQuery selectQuery, TransactionQueryForm
             selectQuery.addConditions(CONNECTOR.CHARGE_BOX_ID.eq(form.getChargeBoxId()));
         }
 
-        if (form.isUserIdSet()) {
-            selectQuery.addConditions(TRANSACTION.ID_TAG.eq(form.getUserId()));
+        if (form.isOcppIdTagSet()) {
+            selectQuery.addConditions(TRANSACTION.ID_TAG.eq(form.getOcppIdTag()));
         }
 
         if (form.getType() == TransactionQueryForm.QueryType.ACTIVE) {
 
@@ -17,7 +17,7 @@
 public abstract class QueryForm {
 
     private String chargeBoxId;
-    private String userId;
+    private String ocppIdTag;
 
     private LocalDateTime from;
     private LocalDateTime to;
@@ -35,7 +35,7 @@ public boolean isChargeBoxIdSet() {
         return chargeBoxId != null;
     }
 
-    public boolean isUserIdSet() {
-        return userId != null;
+    public boolean isOcppIdTagSet() {
+        return ocppIdTag != null;
     }
 }
@@ -7,7 +7,18 @@
 	});
 </script>
 <div class="content">
-<section><span>Reservations</span></section>
+	<section><span>
+		Reservations
+			<a class="tooltip" href="#"><img src="/steve/static/images/info.png" style="vertical-align:middle">
+				<span>
+				Status definitions:
+				WAITING (Waiting for charge point to respond to a reservation request),
+				ACCEPTED (Charge point accepted - The only status for active, usable reservations),
+				USED (Reservation used by the user for a transaction),
+				CANCELLED (Reservation cancelled by the user)
+				</span>
+			</a>
+	</span></section>
 	<form:form action="/steve/manager/reservations/query" method="get" modelAttribute="params">
 		<table class="userInput">
 			<tr>
@@ -20,7 +31,7 @@
 			</tr>
 			<tr>
 				<td>OCPP ID Tag:</td>
-				<td><form:select path="userId">
+				<td><form:select path="ocppIdTag">
 					    <option value="" selected>All</option>
                         <form:options items="${idTagList}"/>
                     </form:select>
 
@@ -30,7 +30,7 @@ Transactions
             </tr>
             <tr>
                 <td>OCPP ID Tag:</td>
-                <td><form:select path="userId">
+                <td><form:select path="ocppIdTag">
                         <option value="" selected>All</option>
                         <form:options items="${idTagList}"/>
                     </form:select>
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,8 @@ public List<Reservation> getReservations(ReservationQueryForm form) {`
`60`	`60`	`selectQuery.addConditions(RESERVATION.CHARGE_BOX_ID.eq(form.getChargeBoxId()));`
`61`	`61`	`}`
`62`	`62`
`63`		`- if (form.isUserIdSet()) {`
`64`		`- selectQuery.addConditions(RESERVATION.ID_TAG.eq(form.getUserId()));`
	`63`	`+ if (form.isOcppIdTagSet()) {`
	`64`	`+ selectQuery.addConditions(RESERVATION.ID_TAG.eq(form.getOcppIdTag()));`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`if (form.isStatusSet()) {`
Original file line number	Diff line number	Diff line change
`@@ -139,8 +139,8 @@ private SelectQuery addConditions(SelectQuery selectQuery, TransactionQueryForm`
`139`	`139`	`selectQuery.addConditions(CONNECTOR.CHARGE_BOX_ID.eq(form.getChargeBoxId()));`
`140`	`140`	`}`
`141`	`141`
`142`		`- if (form.isUserIdSet()) {`
`143`		`- selectQuery.addConditions(TRANSACTION.ID_TAG.eq(form.getUserId()));`
	`142`	`+ if (form.isOcppIdTagSet()) {`
	`143`	`+ selectQuery.addConditions(TRANSACTION.ID_TAG.eq(form.getOcppIdTag()));`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`if (form.getType() == TransactionQueryForm.QueryType.ACTIVE) {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`public abstract class QueryForm {`
`18`	`18`
`19`	`19`	`private String chargeBoxId;`
`20`		`- private String userId;`
	`20`	`+ private String ocppIdTag;`
`21`	`21`
`22`	`22`	`private LocalDateTime from;`
`23`	`23`	`private LocalDateTime to;`
`@@ -35,7 +35,7 @@ public boolean isChargeBoxIdSet() {`
`35`	`35`	`return chargeBoxId != null;`
`36`	`36`	`}`
`37`	`37`
`38`		`- public boolean isUserIdSet() {`
`39`		`- return userId != null;`
	`38`	`+ public boolean isOcppIdTagSet() {`
	`39`	`+ return ocppIdTag != null;`
`40`	`40`	`}`
`41`	`41`	`}`