From 14bfccfc551353c58cceba2f75c8c63022b8a683 Mon Sep 17 00:00:00 2001 From: Andy Janata Date: Sat, 27 Apr 2013 23:23:32 -0700 Subject: [PATCH] Make the View Cards page actually respect card set weight. --- WebContent/viewcards.jsp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/WebContent/viewcards.jsp b/WebContent/viewcards.jsp index 7d6e764..cdc43bd 100644 --- a/WebContent/viewcards.jsp +++ b/WebContent/viewcards.jsp @@ -67,6 +67,7 @@ try { for (CardSet cardSet: cardSets) { Map cardSetData = new HashMap(); cardSetData.put("name", cardSet.getName()); + cardSetData.put("id", cardSet.getId()); cardSetData.put("description", cardSet.getDescription()); List whiteCardIds = new ArrayList(cardSet.getWhiteCards().size()); @@ -91,7 +92,7 @@ try { } cardSetData.put("blackCards", blackCardIds); - cardSetsData.put(cardSet.getId(), cardSetData); + cardSetsData.put(cardSet.getWeight(), cardSetData); } Map blackCardsData = new HashMap(); @@ -139,10 +140,10 @@ var data = <%= JSONValue.toJSONString(data) %>; $(document).ready(function() { var cardSetsElem = $('#cardSets'); - for (var id in data.cardSets) { - var cardSet = data.cardSets[id]; + for (var weight in data.cardSets) { + var cardSet = data.cardSets[weight]; cardSetsElem.append( - ''); + ''); } var tableElem = $('#cards'); @@ -200,13 +201,16 @@ table td {
- Card sets (hold ctrl or cmd to select multiple): + Show only cards from card sets (hold ctrl or cmd to select multiple):
-
- +