Fixed announcements not rendering

This commit is contained in:
Christian 'ketura' McCarty
2024-12-06 19:08:42 -06:00
parent 18bda94cdd
commit 714809f528
6 changed files with 42 additions and 6 deletions

View File

@@ -13,6 +13,11 @@ body {
color: #A63F03; color: #A63F03;
} }
.ui-widget-content a:link,
.msg-content p a:link {
color: #BF6B04;
}
.deckSize { .deckSize {
display: table-cell; display: table-cell;
text-align: center; text-align: center;

View File

@@ -26,7 +26,7 @@ html, body {
a:visited { a:visited {
color: #A63F03; color: #BF6B04;
} }
.custom-icon { .custom-icon {
@@ -215,8 +215,9 @@ button {
#buttonsDiv a, #buttonsDiv a,
#motd a, #motd a,
#infoButtons a, #infoButtons a,
.msg-content p a { .msg-content p a,
color: #BF6B04; #announcement-dialog a {
color: #E88104;
} }
#infoButtons { #infoButtons {
@@ -827,4 +828,12 @@ table.standings {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
padding-bottom: 50px; padding-bottom: 50px;
} }
#announcement-dialog img{
width:90%;
max-width:600px;
display: block;
margin-left: auto;
margin-right: auto;
}

View File

@@ -31,7 +31,7 @@ function announcementDeliveryService(comm, json) {
closeOnEscape:true, closeOnEscape:true,
close: closeCleanup, close: closeCleanup,
resizable:false, resizable:false,
width:$(window).width() * 0.9, width:800,
height:$(window).height() * 0.9, height:$(window).height() * 0.9,
closeText: '' closeText: ''
}); });

View File

@@ -97,7 +97,12 @@ public class CachedTransferDAO implements TransferDAO, Cached {
@Override @Override
public DBDefs.Announcement getUndeliveredAnnouncement(Player player) { public DBDefs.Announcement getUndeliveredAnnouncement(Player player) {
return _delegate.getUndeliveredAnnouncement(player); return this.getUndeliveredAnnouncement(player, getCurrentAnnouncement());
}
@Override
public DBDefs.Announcement getUndeliveredAnnouncement(Player player, DBDefs.Announcement announcement) {
return _delegate.getUndeliveredAnnouncement(player, announcement);
} }
@Override @Override

View File

@@ -18,6 +18,7 @@ public interface TransferDAO {
int addTransferFrom(String player, String reason, String collectionName, int currency, CardCollection items); int addTransferFrom(String player, String reason, String collectionName, int currency, CardCollection items);
DBDefs.Announcement getUndeliveredAnnouncement(Player player); DBDefs.Announcement getUndeliveredAnnouncement(Player player);
DBDefs.Announcement getUndeliveredAnnouncement(Player player, DBDefs.Announcement announcement);
DBDefs.Transfer addAnnouncementEntryForPlayer(DBDefs.Announcement announcement, Player player); DBDefs.Transfer addAnnouncementEntryForPlayer(DBDefs.Announcement announcement, Player player);
void dismissAnnouncement(DBDefs.Announcement announcement, Player player); void dismissAnnouncement(DBDefs.Announcement announcement, Player player);
void snoozeAnnouncement(DBDefs.Announcement announcement, Player player); void snoozeAnnouncement(DBDefs.Announcement announcement, Player player);

View File

@@ -226,8 +226,24 @@ public class DbTransferDAO implements TransferDAO {
} catch (Exception ex) { } catch (Exception ex) {
throw new RuntimeException("Unable to get undelivered announcement for player", ex); throw new RuntimeException("Unable to get undelivered announcement for player", ex);
} }
}
@Override
public DBDefs.Announcement getUndeliveredAnnouncement(Player player, DBDefs.Announcement currentAnnouncement) {
try {
if(currentAnnouncement == null) {
currentAnnouncement = getCurrentAnnouncement();
}
var transferEntry = addAnnouncementEntryForPlayer(currentAnnouncement, player);
if(transferEntry == null || !transferEntry.notify || DateUtils.Now().isBefore(transferEntry.GetUTCDateRecorded()))
return null;
return currentAnnouncement;
} catch (Exception ex) {
throw new RuntimeException("Unable to get undelivered announcement for player", ex);
}
} }
@Override @Override