From d481c318d49462ecad0c589a0fbd69fa46abad14 Mon Sep 17 00:00:00 2001 From: Lukasz Chmielewski Date: Sun, 10 Sep 2017 18:30:33 +0200 Subject: [PATCH] Small adjustments --- controller/match_controller.js | 6 ++++-- public/images/beer.png | Bin 2925 -> 3254 bytes views/index.pug | 2 +- views/match_socket.pug | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/controller/match_controller.js b/controller/match_controller.js index a53c7a6..2fce19d 100644 --- a/controller/match_controller.js +++ b/controller/match_controller.js @@ -287,7 +287,7 @@ router.post('/new', function (req, res) { debug('New game added', gameType); new Game({ game_type_id: gameType, - owe_type_id: gameStake, + owe_type_id: gameStake == "0" ? undefined : gameStake, created_at: moment().format("YYYY-MM-DD HH:mm:ss") }) .save(null, {method: 'insert'}) @@ -450,7 +450,9 @@ router.post('/:id/finish', function (req, res) { winner_id: currentPlayerId, }) .then(function (row) { - + if (game.owe_type_id !== null) { + // TODO - for each player, check if it is a winner and add owe + } res.status(200).end(); }); } else { diff --git a/public/images/beer.png b/public/images/beer.png index ed4fed859037bbb2f36c4f84a683aea56139de98..fe9c0224b9b77ee581f7da82f906ecc1d27a59f4 100644 GIT binary patch literal 3254 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 XG&(RaGYShf00000NkvXXu0mjfqCi&~ diff --git a/views/index.pug b/views/index.pug index 94f61c1..cd9afab 100644 --- a/views/index.pug +++ b/views/index.pug @@ -43,7 +43,7 @@ block content div(class='form-group') label(for='matchStakeSelect') Game Stake select(class='form-control' name='gameStake' id='gameStakeSelect') - option(value=undefined) - + option(value=0) - each gameStake in gameStakes option(value=gameStake.id)=gameStake.item diff --git a/views/match_socket.pug b/views/match_socket.pug index 2d0a2e6..9632c71 100644 --- a/views/match_socket.pug +++ b/views/match_socket.pug @@ -56,10 +56,10 @@ block scripts } if (!player.isBeerCheckoutSafe) { - label.addClass('beer'); + td.addClass('beer'); } else { - label.removeClass('beer'); + td.removeClass('beer'); } if (player.isViliusVisit) { label.addClass('vilius');