Skip to content

Sasha Ortiz-Kalina so2787 CBL #781

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
sortiz-kalina wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Sasha Ortiz-Kalina so2787 CBL #781

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"files.associations": {
"**/templates/*.html": "jinja-html"
}
}
2 changes: 1 addition & 1 deletion server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def increase_score():
for team in scoreboard:
if team["id"] == team_id:
team["score"] += 1

scoreboard.sort(key=lambda t: t['score'], reverse=True)
return jsonify(scoreboard=scoreboard)


Expand Down
53 changes: 39 additions & 14 deletions static/scoreboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ function display_scoreboard(scoreboard){
function addTeamView(id, name, score){
var team_template = $("<div class = row></div>");
var name_template = $("<div class = col-md-5></div>");
var score_template = $("<div class = col-md-2></div>");
var score_template = $("<div class='col-md-2' id='score-" + id + "'></div>");
score_template.text(score);
var button_template = $("<div class = col-md-2></div>");
var increase_button = $("<button class = increase-button>+</button>");
increase_button.data("teamId", id);
$(increase_button).click(function(){
increase_score(id);
});
Expand All @@ -24,25 +26,48 @@ function addTeamView(id, name, score){
}

function increase_score(id){
var team_id = {"id": id}
var $scoreEl = $("#score-" + id);

var $btn = $(":button.increase-button").filter(function(){ return $(this).data("teamId") === id; });


var current = parseInt($scoreEl.text(), 10) || 0;

// UI update
$scoreEl.text(current + 1);
$btn.prop("disabled", true);
var team_id = {"id": id};
$.ajax({
type: "POST",
url: "increase_score",
dataType : "json",
url: "increase_score",
dataType: "json",
contentType: "application/json; charset=utf-8",
data : JSON.stringify(team_id),
data: JSON.stringify(team_id),
success: function(result){

},
if (result && result.scoreboard) {
scoreboard = result.scoreboard.slice(); // replace local model
display_scoreboard(scoreboard);
} else {

var $scoreEl = $("#score-" + id);
$scoreEl.text((parseInt($scoreEl.text(), 10) || 0) + 1);
}
},
error: function(request, status, error){
console.log("Error");
console.log(request)
console.log(status)
console.log(error)
$scoreEl.text(current);
console.error("Failed to increase score:", status, error);
alert("Could not update score — please try again.");
},
complete: function(){
$btn.prop("disabled", false);
}
});
}

$(document).ready(function(){
display_scoreboard(scoreboard);
})
$(document).ready(function(){
if (typeof scoreboard !== 'undefined') {
display_scoreboard(scoreboard);
} else {
console.warn('scoreboard is undefined on page');
}
});
8 changes: 4 additions & 4 deletions templates/scoreboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<head>
<script src="http://code.jquery.com/jquery-3.3.1.min.js"></script>
<script src="https://code.jquery.com/ui/1.12.0/jquery-ui.min.js"></script>
<script type="text/javascript" src="{{ url_for('static', filename = 'scoreboard.js') }}"></script>
<script>
var scoreboard = {{scoreboard|tojson}};
</script>
<script type="text/javascript" src="{{ url_for('static', filename='scoreboard.js') }}?v=1"></script>
<link rel="stylesheet" href="http://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css">
<script>
var scoreboard = {{scoreboard|tojson}}
</script>
<style>
#title{
font-size: 30px;
Expand Down