cell score: table with checkpoint values, moved panels into accodion
This commit is contained in:
parent
a8c50d07ad
commit
387a9ab3da
@ -8,7 +8,7 @@ window.regionScoreboard = function() {
|
|||||||
var latE6 = Math.round(latLng.lat*1E6);
|
var latE6 = Math.round(latLng.lat*1E6);
|
||||||
var lngE6 = Math.round(latLng.lng*1E6);
|
var lngE6 = Math.round(latLng.lng*1E6);
|
||||||
|
|
||||||
var dlg = dialog({title:'Region scores',html:'Loading regional scores...',width:450,minHeight:370});
|
var dlg = dialog({title:'Region scores',html:'Loading regional scores...',width:450,minHeight:320});
|
||||||
|
|
||||||
window.postAjax('getRegionScoreDetails', {latE6:latE6,lngE6:lngE6}, function(res){regionScoreboardSuccess(res,dlg);}, function(){regionScoreboardFailure(dlg);});
|
window.postAjax('getRegionScoreDetails', {latE6:latE6,lngE6:lngE6}, function(res){regionScoreboardSuccess(res,dlg);}, function(){regionScoreboardFailure(dlg);});
|
||||||
}
|
}
|
||||||
@ -107,6 +107,17 @@ function regionScoreboardScoreHistoryChart(result) {
|
|||||||
return svg;
|
return svg;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function regionScoreboardScoreHistoryTable(result) {
|
||||||
|
var history = result.scoreHistory;
|
||||||
|
var table = '<table class="checkpoint_table"><thead><tr><th>Checkpoint</th><th>Enlightened</th><th>Resistance</th></tr></thead>';
|
||||||
|
|
||||||
|
for(var i=0; i<history.length; i++) {
|
||||||
|
table += '<tr><td>' + history[i][0] + '</td><td>' + digits(history[i][1]) + '</td><td>' + digits(history[i][2]) + '</td></tr>';
|
||||||
|
}
|
||||||
|
|
||||||
|
table += '</table>';
|
||||||
|
return table;
|
||||||
|
}
|
||||||
|
|
||||||
function regionScoreboardSuccess(data,dlg) {
|
function regionScoreboardSuccess(data,dlg) {
|
||||||
if (data.result === undefined) {
|
if (data.result === undefined) {
|
||||||
@ -139,12 +150,16 @@ function regionScoreboardSuccess(data,dlg) {
|
|||||||
|
|
||||||
var first = PLAYER.team == 'RESISTANCE' ? 1 : 0;
|
var first = PLAYER.team == 'RESISTANCE' ? 1 : 0;
|
||||||
|
|
||||||
dlg.html('<b>Region scores for '+data.result.regionName+'</b>'
|
// we need some divs to make the accordion work properly
|
||||||
+'<table>'+teamRow[first]+teamRow[1-first]+'</table>'
|
dlg.html('<div class="cellscore">'
|
||||||
+'<b>Checkpoint history</b>'
|
+'<b>Region scores for '+data.result.regionName+'</b>'
|
||||||
+regionScoreboardScoreHistoryChart(data.result)
|
+'<div><table>'+teamRow[first]+teamRow[1-first]+'</table>'
|
||||||
|
+regionScoreboardScoreHistoryChart(data.result)+'</div>'
|
||||||
|
+'<b>Checkpoint overview</b>'
|
||||||
|
+'<div>'+regionScoreboardScoreHistoryTable(data.result)+'</div>'
|
||||||
+'<b>Top agents</b>'
|
+'<b>Top agents</b>'
|
||||||
+agentTable);
|
+'<div>'+agentTable+'</div>'
|
||||||
|
+'</div>');
|
||||||
|
|
||||||
$('g.checkpoint', dlg).each(function(i, elem) {
|
$('g.checkpoint', dlg).each(function(i, elem) {
|
||||||
elem = $(elem);
|
elem = $(elem);
|
||||||
@ -159,4 +174,9 @@ function regionScoreboardSuccess(data,dlg) {
|
|||||||
position: {my: "center bottom", at: "center top-10"}
|
position: {my: "center bottom", at: "center top-10"}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('.cellscore', dlg).accordion({
|
||||||
|
header: 'b',
|
||||||
|
heightStyle: "fill",
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
24
style.css
24
style.css
@ -1099,8 +1099,32 @@ table.artifact td.info {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* region scores */
|
/* region scores */
|
||||||
|
.cellscore .ui-accordion-header, .cellscore .ui-accordion-content {
|
||||||
|
border: 1px solid #20a8b1;
|
||||||
|
margin-top: -1px;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
.cellscore .ui-accordion-header {
|
||||||
|
color: #ffce00;
|
||||||
|
outline: none
|
||||||
|
}
|
||||||
|
.cellscore .ui-accordion-header::before {
|
||||||
|
font-size: 18px;
|
||||||
|
margin-right: 2px;
|
||||||
|
content: "⊞";
|
||||||
|
}
|
||||||
|
.cellscore .ui-accordion-header-active::before {
|
||||||
|
content: "⊟";
|
||||||
|
}
|
||||||
g.checkpoint:hover circle {
|
g.checkpoint:hover circle {
|
||||||
fill-opacity: 1;
|
fill-opacity: 1;
|
||||||
stroke-width: 2px;
|
stroke-width: 2px;
|
||||||
}
|
}
|
||||||
|
.checkpoint_table {
|
||||||
|
border-collapse: collapse;
|
||||||
|
}
|
||||||
|
.checkpoint_table td {
|
||||||
|
text-align: right;
|
||||||
|
padding-left: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user