diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/AdminResource.java b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/AdminResource.java index 0f7bdca9f..de1b0ea14 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/AdminResource.java +++ b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/AdminResource.java @@ -147,9 +147,49 @@ public class AdminResource extends AbstractResource { return "OK"; } - private List getItems(String packProduct) { + @Path("/addLeaguePrize") + @POST + public String addLeaguePrize( + @FormParam("leagueType") String leagueType, + @FormParam("packProduct") String packProduct, + @FormParam("cardProduct") String cardProduct, + @FormParam("players") String players, + @Context HttpServletRequest request) throws Exception { + validateAdmin(request); + + League league = getLeagueByType(leagueType); + if (league == null) + throw new WebApplicationException(Response.Status.NOT_FOUND); + + List items = new LinkedList(); + + List packs = getItems(packProduct); + List cards = getItems(cardProduct); + + for (String pack : packs) + items.add(new CardCollection.Item(CardCollection.Item.Type.PACK, 1, pack)); + for (String card : cards) + items.add(new CardCollection.Item(CardCollection.Item.Type.CARD, 1, card)); + + List playerNames = getItems(players); + + for (String playerName : playerNames) { + Player player = _playerDao.getPlayer(playerName); + MutableCardCollection collection = _collectionDao.getCollectionForPlayer(player, leagueType); + for (String pack : packs) + collection.addPacks(pack, 1); + for (String card : cards) + collection.addCards(card, 1); + _collectionDao.setCollectionForPlayer(player, leagueType, collection); + _deliveryService.addPackage(player, leagueType, items); + } + + return "OK"; + } + + private List getItems(String values) { List result = new LinkedList(); - for (String pack : packProduct.split("\n")) { + for (String pack : values.split("\n")) { String blueprint = pack.trim(); if (blueprint.length() > 0) result.add(blueprint); diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/admin.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/admin.html index 6cce632f7..824967c21 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/admin.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/admin.html @@ -21,7 +21,7 @@ Start:
End:
Packs:
- +

Add season

@@ -29,10 +29,11 @@
League type:
Season type:
+ Format:
Start:
End:
Max matches:
- +

Add league product

@@ -42,7 +43,17 @@ Packs:
Cards:
Skip base collection:
- + + + +

Add league prize

+ +
+ Type:
+ Packs:
+ Cards:
+ Players:
+
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html index fec80e519..dab462bc7 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html @@ -12,6 +12,14 @@ background-color: #000000; } + .borderOverlay { + border: 2px solid #000000; + } + + .foilOverlay { + opacity: 0.2; + } + .tableFormatName { text-align: center; font-weight: bold; @@ -120,6 +128,10 @@ + + + +