mirrors
/
PretendYoureXyzzy
mirror of https://github.com/ajanata/PretendYoureXyzzy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make the View Cards page actually respect card set weight.

This commit is contained in:
Andy Janata 2013-04-27 23:23:32 -07:00
parent 6423d86f11
commit 14bfccfc55
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
WebContent/viewcards.jsp
View File

@ -67,6 +67,7 @@ try {
for (CardSet cardSet: cardSets) { for (CardSet cardSet: cardSets) {
Map<String, Object> cardSetData = new HashMap<String, Object>(); Map<String, Object> cardSetData = new HashMap<String, Object>();
cardSetData.put("name", cardSet.getName()); cardSetData.put("name", cardSet.getName());
cardSetData.put("id", cardSet.getId());
cardSetData.put("description", cardSet.getDescription()); cardSetData.put("description", cardSet.getDescription());
List<Integer> whiteCardIds = new ArrayList<Integer>(cardSet.getWhiteCards().size()); List<Integer> whiteCardIds = new ArrayList<Integer>(cardSet.getWhiteCards().size());
@ -91,7 +92,7 @@ try {
} }
cardSetData.put("blackCards", blackCardIds); cardSetData.put("blackCards", blackCardIds);
cardSetsData.put(cardSet.getId(), cardSetData); cardSetsData.put(cardSet.getWeight(), cardSetData);
} }
Map<Integer, Object> blackCardsData = new HashMap<Integer, Object>(); Map<Integer, Object> blackCardsData = new HashMap<Integer, Object>();
@ -139,10 +140,10 @@ var data = <%= JSONValue.toJSONString(data) %>;
$(document).ready(function() { $(document).ready(function() {
var cardSetsElem = $('#cardSets'); var cardSetsElem = $('#cardSets');
for (var id in data.cardSets) { for (var weight in data.cardSets) {
var cardSet = data.cardSets[id]; var cardSet = data.cardSets[weight];
cardSetsElem.append( cardSetsElem.append(
'<option value="' + id + '" selected="selected">' + cardSet.name + '</option>'); '<option value="' + cardSet.id + '" selected="selected">' + cardSet.name + '</option>');
} }
var tableElem = $('#cards'); var tableElem = $('#cards');
@ -200,13 +201,16 @@ table td {
</head> </head>
<body> <body>
<div style="float: left;"> <div style="float: left;">
Card sets (hold ctrl or cmd to select multiple): Show only cards from card sets (hold ctrl or cmd to select multiple):
<br/> <br/>
<select id="cardSets" multiple="multiple" style="height: 150px; width: 400px;"> <select id="cardSets" multiple="multiple" style="height: 150px; width: 450px;">
</select> </select>
</div> </div>
<div> <div>
<label for="search" style="padding-left: 10px;">Search card text:</label> <label for="search" style="padding-left: 10px;"
title="Search for text in cards. You can use regular expressions.">
Search card text:
</label>
<input type="text" id="search" style="width: 400px;" /> <input type="text" id="search" style="width: 400px;" />
</div> </div>
<div style="clear:both"></div> <div style="clear:both"></div>