Skip to content

Ranking: Merge First and Last Name columns into a Name column #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fushar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ranking: Merge First and Last Name columns into a Name column #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions cmsranking/static/Scoreboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ var Scoreboard = new function () {
<col class=\"sel\"/> \
<col class=\"rank\"/> \
<col class=\"f_name\"/> <col/><col/><col/><col/><col/><col/><col/><col/><col/> \
<col class=\"l_name\"/> <col/><col/><col/><col/><col/><col/><col/><col/><col/> \
<col/><col/><col/><col/><col/><col/> \
<col class=\"team\"/>";

var contests = DataStore.contest_list;
Expand Down Expand Up @@ -188,8 +188,7 @@ var Scoreboard = new function () {
<tr> \
<th class=\"sel\"></th> \
<th class=\"rank\">Rank</th> \
<th colspan=\"10\" class=\"f_name\">First Name</th> \
<th colspan=\"10\" class=\"l_name\">Last Name</th> \
<th colspan=\"16\" class=\"f_name\">Name</th> \
<th class=\"team\">Team</th>";

var contests = DataStore.contest_list;
Expand Down Expand Up @@ -235,8 +234,7 @@ var Scoreboard = new function () {
<tr class=\"user" + (user["selected"] > 0 ? " selected color" + user["selected"] : "") + "\" data-user=\"" + user["key"] + "\"> \
<td class=\"sel\"></td> \
<td class=\"rank\">" + user["rank"] + "</td> \
<td colspan=\"10\" class=\"f_name\">" + escapeHTML(user["f_name"]) + "</td> \
<td colspan=\"10\" class=\"l_name\">" + escapeHTML(user["l_name"]) + "</td>";
<td colspan=\"16\" class=\"f_name\">" + escapeHTML(user["f_name"]) + " " + escapeHTML(user["l_name"]) + "</td>";

if (user['team']) {
result += " \
Expand Down Expand Up @@ -403,8 +401,7 @@ var Scoreboard = new function () {
delete old_user["row"];
delete old_user["index"];

$row.children("td.f_name").text(user["f_name"]);
$row.children("td.l_name").text(user["l_name"]);
$row.children("td.f_name").text(user["f_name"] + " " + user["l_name"]);

$row.children(".team").text(user['key']);
if (user["team"]) {
Expand Down