Skip to content

Commit

Permalink
use total tuh as metric for deletion ability
Browse files Browse the repository at this point in the history
  • Loading branch information
mostafab committed Nov 22, 2017
1 parent 4cb0df1 commit c43b193
Show file tree
Hide file tree
Showing 11 changed files with 112,097 additions and 40 deletions.
5 changes: 1 addition & 4 deletions .eslintrc.json
@@ -1,6 +1,3 @@
{
"extends": "airbnb-base",
"plugins": [
"import"
]
"extends": "google"
}
110,100 changes: 110,076 additions & 24 deletions app/public/dist/assets/app.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/public/dist/assets/app.bundle.js.map

Large diffs are not rendered by default.

1,979 changes: 1,978 additions & 1 deletion app/public/dist/assets/bundle.css

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion app/public/javascript/modules/services/team.service.js
Expand Up @@ -357,7 +357,7 @@ export default class TeamService {
newName: p.player_name,
id: p.player_id,
addedBy: p.added_by,
games: p.games,
totalTossupsHeard: p.total_tossups_heard,
}
)),
mappedDivisions: divisions.reduce((aggr, current) => {
Expand All @@ -370,6 +370,8 @@ export default class TeamService {
name: '',
},
};

console.log(formattedTeam);
return formattedTeam;
}

Expand Down
6 changes: 1 addition & 5 deletions app/sql/player-sql/removeTeamPlayer.sql
Expand Up @@ -2,10 +2,6 @@ DELETE

FROM tournament_player

WHERE id = $2 AND tournament_id = $1 AND NOT EXISTS (
SELECT player_id
FROM player_plays_in_tournament_match
WHERE player_id = $2 AND tournament_id = $1
)
WHERE id = $2 AND tournament_id = $1

RETURNING id;
6 changes: 3 additions & 3 deletions app/sql/team-sql/findTeamById.sql
Expand Up @@ -7,7 +7,7 @@ LEFT JOIN
(
SELECT
P.team_id,
array_agg(json_build_object('player_name', P.name, 'player_id', P.id, 'added_by', P.added_by, 'games', COALESCE(player_games.games_counted, 0))) as players
array_agg(json_build_object('player_name', P.name, 'player_id', P.id, 'added_by', P.added_by, 'total_tossups_heard', COALESCE(player_games.total_tossups_heard, 0))) as players

FROM

Expand All @@ -18,7 +18,7 @@ LEFT JOIN
(
SELECT
PPM.player_id,
COUNT(*)::integer as games_counted
SUM(tossups_heard)::integer as total_tossups_heard
FROM player_plays_in_tournament_match PPM
WHERE PPM.tournament_id = $1
GROUP BY PPM.player_id
Expand All @@ -35,7 +35,7 @@ LEFT JOIN
ON T.id = team_players.team_id

INNER JOIN
-- Find all divisions
-- Find all divisions
(

SELECT
Expand Down
2 changes: 1 addition & 1 deletion app/views/team/team-view.jade
Expand Up @@ -64,7 +64,7 @@ div(ng-show='Team.currentTeam.id' ng-class='{"col-lg-12" : !Team.currentTeam.id,
i.fa.fa-times
span.input-group-addon.nf-button.btn.no-border.nf-green(ng-if='tournamentContext.admin' ng-click='Team.savePlayerNameOnCurrentTeam(player)' ng-show='player.editing')
i.fa.fa-check
.col-lg-2.col-md-2.col-sm-2(ng-if='player.games === 0')
.col-lg-2.col-md-2.col-sm-2(ng-if='player.totalTossupsHeard === 0')
.input-group.nf-margin
span.input-group-addon.nf-button.btn.no-border.nf-red(ng-click='Team.removeCurrentTeamPlayer(player)' ng-if='tournamentContext.admin' ng-show='!player.editing' title='Remove {{player.name}}. Will fail if this player has participated in a match.')
i.fa.fa-trash
Expand Down
@@ -0,0 +1,19 @@
begin;

alter table player_match_tossup
drop constraint player_match_tossup_player_id_fkey;

alter table player_match_tossup
add constraint player_match_tossup_player_id_fkey
foreign key (player_id, tournament_id)
references tournament_player(id, tournament_id)
on delete cascade;

alter table player_match_tossup
add constraint player_match_tossup_player_plays_in_tournament_match_fkey
foreign key (player_id, match_id, tournament_id)
references player_plays_in_tournament_match(player_id, match_id, tournament_id)
on delete cascade;

commit;

@@ -0,0 +1,13 @@
begin;

alter table player_plays_in_tournament_match
drop constraint player_plays_in_tournament_match_player_id_fkey;

alter table player_plays_in_tournament_match
add constraint player_plays_in_tournament_match_tournament_player_fkey
foreign key (player_id, tournament_id)
references tournament_player(id, tournament_id)
on delete cascade;

commit;

1 change: 1 addition & 0 deletions package.json
Expand Up @@ -68,6 +68,7 @@
"css-loader": "^0.23.1",
"eslint": "^3.12.2",
"eslint-config-airbnb-base": "^11.0.0",
"eslint-config-google": "^0.9.1",
"eslint-plugin-import": "^2.2.0",
"extract-text-webpack-plugin": "^2.1.2",
"file-loader": "^0.9.0",
Expand Down

0 comments on commit c43b193

Please sign in to comment.