Merge pull request #456 from hormiai76/master

Removing shipment and all associated containers and samples
ispyb · Nov 14, 2019 · e14293f · e14293f
2 parents 78f144f + a74f74e
commit e14293f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ispyb-ui/src/main/webapp/tmp/ParcelLabelsTemplate_MAXIV.pdf b/ispyb-ui/src/main/webapp/tmp/ParcelLabelsTemplate_MAXIV.pdf
diff --git a/ispyb-ws/src/main/java/ispyb/ws/rest/proposal/ShippingRestWebService.java b/ispyb-ws/src/main/java/ispyb/ws/rest/proposal/ShippingRestWebService.java
@@ -392,9 +392,10 @@ public Response removeShipment(@PathParam("token") String token, @PathParam("pro
 		long id = this.logInit("removeShipment", logger, token, proposal, shippingId);
 		try {
 			this.getShipping3Service().deleteAllSamplesAndContainersForShipping(shippingId);
-			//(new Integer(shippingId));
+			this.getShipping3Service().deleteByPk(shippingId);
 			this.logFinish("removeShipment", id, logger);
-			return sendResponse(this.getShipping3Service().getShippingById(shippingId));
+			return sendResponse(true);
+			//return sendResponse(this.getShipping3Service().getShippingById(shippingId));
 		} catch (Exception e) {
 			return this.logError("removeShipment", e, id, logger);
 		}