commit 00e56f23

sago007 · 2019-03-24 10:10
00e56f23f501c051f45168ad114cbcbf1f4c79cf patch · browse files
parent 59f20ed09ce623d1db90a1f4dc2694c6e88bb7d9

Add player name to score list

Changed files

M	src/oastat_static_web_generator.cpp before
M	templates/game.tpl before

diff --git a/src/oastat_static_web_generator.cpp b/src/oastat_static_web_generator.cpp index 7bc0010..42923d1 100644 --- a/src/oastat_static_web_generator.cpp +++ b/src/oastat_static_web_generator.cpp

@@ -279,6 +279,15 @@ void getGameScoreTotal(cppdb::session& database, int gamenumber, std::vector<std

}

+void addPlayerToTemplateDict(ctemplate::TemplateDictionary* dict, const OastatPlayer& player) {

+ dict->SetValue("PLAYER_ID", std::to_string(player.playerid));

+ dict->SetValue("PLAYER_HEADMODEL", player.headmodel);

+ dict->SetValue("PLAYER_ISBOT", player.isBot);

+ dict->SetValue("PLAYER_LASTSEEN", getTimeStamp(player.lastseen));

+ dict->SetValue("PLAYER_MODEL", player.model);

+ dict->SetValue("PLAYER_NICKNAME", player.nickname);

void write_html_game(cppdb::session& database, const OastatGame& game) {

ctemplate::TemplateDictionary game_tpl("templates/game.tpl");

game_tpl.SetValue("GENERATION_DATE", timestamp_now_as_string(database));

@@ -289,8 +298,10 @@ void write_html_game(cppdb::session& database, const OastatGame& game) {

getGameScoreTotal(database, game.gamenumber, scores);

for (size_t i = 0; i < scores.size(); ++i) {

ctemplate::TemplateDictionary* sub_dict = game_tpl.AddSectionDictionary("SCORES_LIST");

+ const OastatPlayer& p = getPlayer(database, scores.at(i).first);

sub_dict->SetValue("ID", std::to_string(scores.at(i).first));

sub_dict->SetValue("SCORE", std::to_string(scores.at(i).second));

+ addPlayerToTemplateDict(sub_dict, p);

}

std::string output;

ctemplate::ExpandTemplate("templates/game.tpl", ctemplate::DO_NOT_STRIP, &game_tpl, &output);

diff --git a/templates/game.tpl b/templates/game.tpl index 8cc9235..a1bb020 100644 --- a/templates/game.tpl +++ b/templates/game.tpl

@@ -40,12 +40,12 @@

{{GAME_MAP}} at {{GAME_SERVERNAME}}

<table>

<tr>

- <th>Player id</th>

+ <th>Player</th>

<th>Score</th>

</tr>

<tr>

- <td>{{ID}}</td>

+ <td>{{PLAYER_NICKNAME}}</td>

<td>{{SCORE}}</td>

</tr>