JavaIsJavaScript
diff --git a/‎src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java‎
Lines changed: 1 addition & 1 deletion b/‎src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java‎
Lines changed: 2 additions & 1 deletion b/‎src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java‎
Lines changed: 1 addition & 1 deletion b/‎src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/java/de/rwth/idsg/steve/web/dto/ocpp15/ReserveNowParams.java‎
Lines changed: 1 addition & 1 deletion b/‎src/main/java/de/rwth/idsg/steve/web/dto/ocpp15/ReserveNowParams.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/resources/webapp/WEB-INF/views/op15/ReserveNow.jsp‎
Lines changed: 1 addition & 1 deletion b/‎src/main/resources/webapp/WEB-INF/views/op15/ReserveNow.jsp‎
Lines changed: 1 addition & 1 deletion
@@ -24,7 +24,7 @@ public interface ChargePointRepository {
     ChargePoint.Details getDetails(int chargeBoxPk);
 
     List<ConnectorStatus> getChargePointConnectorStatus();
-    List<Integer> getConnectorIds(String chargeBoxId);
+    List<Integer> getNonZeroConnectorIds(String chargeBoxId);
 
     void addChargePoint(List<String> chargeBoxIdList);
     int addChargePoint(ChargePointForm form);
 
@@ -209,10 +209,11 @@ public List<ConnectorStatus> getChargePointConnectorStatus() {
     }
 
     @Override
-    public List<Integer> getConnectorIds(String chargeBoxId) {
+    public List<Integer> getNonZeroConnectorIds(String chargeBoxId) {
         return ctx.select(CONNECTOR.CONNECTOR_ID)
                   .from(CONNECTOR)
                   .where(CONNECTOR.CHARGE_BOX_ID.equal(chargeBoxId))
+                  .and(CONNECTOR.CONNECTOR_ID.notEqual(0))
                   .fetch(CONNECTOR.CONNECTOR_ID);
     }
 
 
@@ -57,7 +57,7 @@ private void init() {
 
     @RequestMapping(value = CONNECTOR_IDS_PATH)
     public String getConnectorIds(@PathVariable("chargeBoxId") String chargeBoxId) {
-        return serializeArray(chargePointRepository.getConnectorIds(chargeBoxId));
+        return serializeArray(chargePointRepository.getNonZeroConnectorIds(chargeBoxId));
     }
 
     @RequestMapping(value = TRANSACTION_IDS_PATH)
 
@@ -20,7 +20,7 @@
 public class ReserveNowParams extends SingleChargePointSelect {
 
     @NotNull(message = "Connector ID is required")
-    @Min(value = 0, message = "Connector ID must be at least {value}")
+    @Min(value = 1, message = "Connector ID must be at least {value}")
     private Integer connectorId;
 
     @NotNull(message = "Expiry Date/Time is required")
 
@@ -2,7 +2,7 @@
 <%@ include file="../00-op-bind-errors.jsp" %>
 <script type="text/javascript">
     $(document).ready(function() {
-        <%@ include file="../snippets/getConnectorIdsZeroAllowed.js" %>
+        <%@ include file="../snippets/getConnectorIds.js" %>
         <%@ include file="../snippets/dateTimePicker-future.js" %>
     });
 </script>
Original file line number	Diff line number	Diff line change
`@@ -209,10 +209,11 @@ public List<ConnectorStatus> getChargePointConnectorStatus() {`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`@Override`
`212`		`- public List<Integer> getConnectorIds(String chargeBoxId) {`
	`212`	`+ public List<Integer> getNonZeroConnectorIds(String chargeBoxId) {`
`213`	`213`	`return ctx.select(CONNECTOR.CONNECTOR_ID)`
`214`	`214`	`.from(CONNECTOR)`
`215`	`215`	`.where(CONNECTOR.CHARGE_BOX_ID.equal(chargeBoxId))`
	`216`	`+ .and(CONNECTOR.CONNECTOR_ID.notEqual(0))`
`216`	`217`	`.fetch(CONNECTOR.CONNECTOR_ID);`
`217`	`218`	`}`
`218`	`219`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ private void init() {`
`57`	`57`
`58`	`58`	`@RequestMapping(value = CONNECTOR_IDS_PATH)`
`59`	`59`	`public String getConnectorIds(@PathVariable("chargeBoxId") String chargeBoxId) {`
`60`		`- return serializeArray(chargePointRepository.getConnectorIds(chargeBoxId));`
	`60`	`+ return serializeArray(chargePointRepository.getNonZeroConnectorIds(chargeBoxId));`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`@RequestMapping(value = TRANSACTION_IDS_PATH)`