ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing hall.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-12-25 17:07:13 +00:00
parent d69a934207
commit 2a0b0ad60f
5 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultCardCollection.java
View File

@@ -187,6 +187,14 @@ public class DefaultCardCollection implements MutableCardCollection {
return null;
}
public void waitTillLoaded() {
try {
_collectionReadyLatch.await();
} catch (InterruptedException exp) {
throw new RuntimeException(exp);
}
}
@Override
public Map<String, Integer> getAll() {
return Collections.unmodifiableMap(_counts);

1
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
View File

@@ -78,6 +78,7 @@ public class LotroServer extends AbstractServer {
}
public CardCollection getDefaultCollection() {
_defaultCollection.waitTillLoaded();
return _defaultCollection;
}

6
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
View File

@@ -210,7 +210,11 @@ public class HallServer extends AbstractServer {
}
// Now check if player owns all the cards
CardCollection collection = _collectionDao.getCollectionForPlayer(player, collectionType.getCode());
CardCollection collection;
if (collectionType.getCode().equals("default"))
collection = _lotroServer.getDefaultCollection();
else
collection = _collectionDao.getCollectionForPlayer(player, collectionType.getCode());
Map<String, Integer> deckCardCounts = CollectionUtils.getTotalCardCountForDeck(lotroDeck);
final Map<String, Integer> collectionCardCounts = collection.getAll();

9
gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
View File

@@ -78,6 +78,15 @@
font-size: 90%;
}
table.tables {
width: 100%;
}
table.tables td, table.tables th {
padding: 2px;
border: 1px solid white;
}
.ui-tabs-nav li {
font-size: 70%;
}

4
gemp-lotr/gemp-lotr-web/src/main/webapp/js/hallUi.js
View File

@@ -147,7 +147,7 @@ var GempLotrHallUI = Class.extend({
var tables = root.getElementsByTagName("table");
var tablesTable = $("<table class='tables'></table>");
tablesTable.append("<tr><th>Format</th><th>Tournament</th><th>Status</th><th>Players</th><th>Actions</th></tr>");
tablesTable.append("<tr><th width='20%'>Format</th><th width='30%'>Tournament</th><th width='10%'>Status</th><th width='20%'>Players</th><th width='20%'>Actions</th></tr>");
for (var i = 0; i < tables.length; i++) {
var table = tables[i];
@@ -257,6 +257,6 @@ var GempLotrHallUI = Class.extend({
row.append(actionsField);
this.container.append(row);
container.append(row);
}
});