Skip to content

Commit a388355

Browse files
committed
[feature firebase-migration]: Refactor post saving of players
1 parent fce4c2f commit a388355

File tree

3 files changed

+12
-67
lines changed

3 files changed

+12
-67
lines changed

app/scripts/manager/manager-ctrl.js

+3-25
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,6 @@ angular.module( 'pokerManager' ).
4141

4242
vm.init();
4343

44-
function playerSaved( savedPlayer ) {
45-
// console.log('savedPlayer = ' + savedPlayer);
46-
var isNew = true,
47-
playerIdx, len,
48-
players = vm.players;
49-
50-
for ( playerIdx = 0, len = players.length; playerIdx < len; ++playerIdx ) {
51-
if ( players[ playerIdx ].id === savedPlayer.id) {
52-
isNew = false;
53-
break;
54-
}
55-
}
56-
57-
if ( isNew ) {
58-
players.push( savedPlayer );
59-
} else {
60-
players[ playerIdx ] = savedPlayer;
61-
}
62-
}
63-
6444
function openPlayersControl() {
6545
vm.prefs.playersOpen = !vm.prefs.playersOpen;
6646
}
@@ -184,15 +164,13 @@ angular.module( 'pokerManager' ).
184164
if ( savedPlayer.isNew ) {
185165
savedPlayer.buyin = 0;
186166
savedPlayer.isPlaying = false;
187-
// Update changed fields
167+
vm.players.push( savedPlayer );
188168
}
189169

190170
player = savedPlayer;
191-
192-
// Model.savePlayer( player );
171+
193172
return Players.update( player ).$promise;
194-
} )
195-
.then( playerSaved );
173+
} );
196174
}
197175

198176
$scope.$watch( function () {

app/scripts/services/communities.service.js

-12
This file was deleted.

app/scripts/stats/stats-ctrl.js

+9-30
Original file line numberDiff line numberDiff line change
@@ -54,25 +54,6 @@ angular.module( 'pokerManager' ).
5454
vm.filterPlayers = filterPlayers;
5555
vm.playerPredicate = playerPredicate;
5656

57-
function playerSaved( savedPlayer ) {
58-
// console.log('savedPlayer = ' + savedPlayer);
59-
var isNew = true,
60-
playerIdx,
61-
players = vm.displayGames.players;
62-
63-
isNew = players.some( function ( player ) {
64-
return player.id === savedPlayer.id;
65-
} );
66-
67-
if ( isNew ) {
68-
players.push( savedPlayer );
69-
} else {
70-
savedPlayer.buyin = players[ playerIdx ].buyin;
71-
savedPlayer.buyout = players[ playerIdx ].buyout;
72-
players[ playerIdx ] = savedPlayer;
73-
}
74-
}
75-
7657
function formatDate( aDate ) {
7758
return $filter( 'date' )( aDate, 'y-MM-dd' );
7859
}
@@ -183,17 +164,15 @@ angular.module( 'pokerManager' ).
183164
function openPlayerDetailsDialog( player ) {
184165
playerModal.open( player )
185166
.then( function ( savedPlayer ) {
186-
// If new -> update default values
187-
if ( isNew ) {
188-
savedPlayer.buyin = 0;
189-
savedPlayer.isPlaying = false;
190-
}
191-
192-
player = savedPlayer;
193-
194-
return Players.update( player ).$promise;
195-
} )
196-
.then( playerSaved );;
167+
/*
168+
* Update the local instance if the player with the changeable fields from the modal
169+
*/
170+
player.name = savedPlayer.name;
171+
player.phone = savedPlayer.phone;
172+
player.email = savedPlayer.email;
173+
174+
return Players.update( savedPlayer ).$promise;
175+
} );
197176
}
198177
}
199178
})();

0 commit comments

Comments
 (0)