From 20a4572f907ad5ba15596aadd5c0561f8448ee52 Mon Sep 17 00:00:00 2001 From: Alberto Nardella Date: Mon, 4 Nov 2019 15:34:41 +0100 Subject: [PATCH 1/3] New MAXIV print labels template --- .../webapp/tmp/ParcelLabelsTemplate_MAXIV.pdf | Bin 1754915 -> 1761064 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ispyb-ui/src/main/webapp/tmp/ParcelLabelsTemplate_MAXIV.pdf b/ispyb-ui/src/main/webapp/tmp/ParcelLabelsTemplate_MAXIV.pdf index b3ed5b832f6dd2d5654df0adfc115daceef1f3b1..d042b35ce15868d10375a2eaa7993de9c02c9cc9 100644 GIT binary patch delta 1796 zcmah}Yitxn9H-Yp%eF@gSFxN4j#sf)V0UNsz1#MnucK9<$MqDoG`M%&ZLi$jwtHK8 zHR^#`4VXX-H9ce1paepcNQzBMj2d|~d?6S>VkE}+K}}2w(P$#_L7aPlKuFAHXEOi! zKYsK3KMw8RarDa_yX+#{VHeva_CkA+U22!vi*3R#w<~O?y~M7xtL&xrGTUWW+Yi~x z?T76ed&RW7_S|ger|#1ZmrNo=LN0`Og=G{@S_4sL<&1muffq+-+}}N}^N?lwG@cZ6 zRwp?&+((8Z5rz!&oGu|jl?6ULdwACUb9tI)IRJqX9&|P~(#-+9Yz92bV_DGWqg#6r z1wrBOrCW`Jr6sJScXfMr&`&}LDa5d=>*-cgQ?00xXj3iC+omuO$p}FX@hsjj-Z}{D z>gl#-FQg<{0@#dYS-df6#EZb}2Xu!P+X)Z@LORy#_Ubs20h@|PVq_QMZd6ndNRU~DoBa)GHNf()j&U11-9RM6gj#;9Et=`6U zsdxr7o z0FboCVp@|YPgC?oO-UDsyPuLBVy1I4U5!U$W6FcF zbZ>fcj?yuYuW`tCZ|OABL%v2j%apI44r&pr2Z;j^6A8oe`J9@V=*yOQzPJko z--2EIU&PF*c}I0I1Le%rUPq0eybX{nAne7slg5Y{(UQ1({J1RfmM>?7OFh>|0n>R!wh&kC90eeT-K@iXqli#Q376qM;2 zcGOVJ6xR&{dxR;jG}uf$F|j;wb=k&Acg^}}t2bV9c;92wQ;YZPUswhg{2Fq8FkZC8 zg`J82IV)u#cgI_L?siUQ zqz!h-<>7bFzrL$-s#=I|dY{|2rShY$p1l(nCTq(Mk+Z?^(fNx9#?ooZk3T;i*!lW6lkVxJ-1;{iIK31jx0qtlY+k4Cika8J-c^C4uEQ zQRGEmFWs5w(^5U0g!9hvD7(r6Ub91;AFnD}KFINOz|`<$MFJf(3=6B_xr?V(Hy#OC zPtG^Vvq4R#xAq`_FMEBy>{wOfPGaDPaQH3dlk;b9oWJ>qtGM_~`pB)|)|Yp!{pHsB sSEIEZ$0|GEU~x&!f=hB)W@&kGb*AE+yP{GQpol~#v1(O&m)}YJ3v;m~-T(jq delta 61 zcmV~$xfMeI007X3Ac-@MI9lUbLh Date: Wed, 6 Nov 2019 15:46:00 +0100 Subject: [PATCH 2/3] Removing shipment and all containers and samples associated --- .../java/ispyb/ws/rest/proposal/ShippingRestWebService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 index 9f8ea4f7f..cb126ea66 100644 --- 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 this.sendResponse("Ok"); + //return sendResponse(this.getShipping3Service().getShippingById(shippingId)); } catch (Exception e) { return this.logError("removeShipment", e, id, logger); } From a74f74e27fd5a4d2b540b8214fd8c68af71bfb79 Mon Sep 17 00:00:00 2001 From: Alberto Nardella Date: Thu, 7 Nov 2019 09:56:18 +0100 Subject: [PATCH 3/3] Returning true after deleting a shipment and all the containners and samples associated --- .../java/ispyb/ws/rest/proposal/ShippingRestWebService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index cb126ea66..ae67225b4 100644 --- a/ispyb-ws/src/main/java/ispyb/ws/rest/proposal/ShippingRestWebService.java +++ b/ispyb-ws/src/main/java/ispyb/ws/rest/proposal/ShippingRestWebService.java @@ -394,7 +394,7 @@ public Response removeShipment(@PathParam("token") String token, @PathParam("pro this.getShipping3Service().deleteAllSamplesAndContainersForShipping(shippingId); this.getShipping3Service().deleteByPk(shippingId); this.logFinish("removeShipment", id, logger); - return this.sendResponse("Ok"); + return sendResponse(true); //return sendResponse(this.getShipping3Service().getShippingById(shippingId)); } catch (Exception e) { return this.logError("removeShipment", e, id, logger);