From 44aaf394c6f72f97f8a5d1e6d8ba90f117141a1d Mon Sep 17 00:00:00 2001 From: "github.user-at-576386355408" Date: Sat, 3 Feb 2018 10:35:42 -0500 Subject: [PATCH 1/3] Refactored activeTF flag to be is_active, for naming conventions --- test/test_server.py | 6 ++--- webapp/app/players/views/merges.html | 2 +- .../controllers/adminFunctions.controller.js | 6 ++--- .../views/admin_functions.html | 4 +-- .../views/var r = db.regions.find(); | 25 +++++++++++++++++++ 5 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 webapp/app/tournaments/views/var r = db.regions.find(); diff --git a/test/test_server.py b/test/test_server.py index a7ed8d3..963b6b3 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -199,7 +199,7 @@ def test_get_region_list(self): 'regions': [ { 'id': 'norcal', - 'activeTF': True, + 'is_active': True, 'display_name': 'Norcal', 'ranking_num_tourneys_attended': 2, 'ranking_activity_day_limit': 60, @@ -207,7 +207,7 @@ def test_get_region_list(self): }, { 'id': 'texas', - 'activeTF': True, + 'is_active': True, 'display_name': 'Texas', 'ranking_num_tourneys_attended': 2, 'ranking_activity_day_limit': 60, @@ -223,7 +223,7 @@ def test_get_region_list(self): def test_change_region_active_flag(self, mock_admin_user): data = { 'region_id': 'norcal', - 'activeTF': 'false' + 'is_active': 'false' } response = self.app.post('/regions', data=json.dumps(data), content_type='application/json') diff --git a/webapp/app/players/views/merges.html b/webapp/app/players/views/merges.html index ed3ed06..2ea9a33 100644 --- a/webapp/app/players/views/merges.html +++ b/webapp/app/players/views/merges.html @@ -21,7 +21,7 @@

Undo Merges

Merged On - + {{merge.source_player_name}} {{merge.target_player_name}} {{merge.requester_user_id}} diff --git a/webapp/app/tools/admin_functions/controllers/adminFunctions.controller.js b/webapp/app/tools/admin_functions/controllers/adminFunctions.controller.js index 819f3e3..81b21a7 100644 --- a/webapp/app/tools/admin_functions/controllers/adminFunctions.controller.js +++ b/webapp/app/tools/admin_functions/controllers/adminFunctions.controller.js @@ -44,17 +44,17 @@ angular.module('app.tools').controller("AdminFunctionsController", function($sco $scope.changeRegionActiveTF = function(region){ var region_id = region.id; - var newActiveTF = !(region.activeTF) + var newIsActive = !(region.is_active) var url = hostname + 'regions'; var postParams = { region_id: region_id, - activeTF: newActiveTF + is_active: newIsActive } $scope.sessionService.authenticatedPost(url, postParams, (data)=>{ - //alert(region_id + ' active flag changed to ' + newActiveTF + '!'); + //alert(region_id + ' active flag changed to ' + newIsActive + '!'); // TODO refresh the scope updateRegions(); $scope.regionService.updateRegionDropdown(); diff --git a/webapp/app/tools/admin_functions/views/admin_functions.html b/webapp/app/tools/admin_functions/views/admin_functions.html index 71a93e5..e6e3b17 100644 --- a/webapp/app/tools/admin_functions/views/admin_functions.html +++ b/webapp/app/tools/admin_functions/views/admin_functions.html @@ -36,10 +36,10 @@

Activation

{{r.display_name}} - {{r.activeTF}} + {{r.is_active}} -
+
diff --git a/webapp/app/tournaments/views/var r = db.regions.find(); b/webapp/app/tournaments/views/var r = db.regions.find(); new file mode 100644 index 0000000..de4776c --- /dev/null +++ b/webapp/app/tournaments/views/var r = db.regions.find(); @@ -0,0 +1,25 @@ +var r = db.regions.find(); + +r.forEach(region => { + db.regions.update( + {_id: region._id}, + {$rename: {"activeTF": "is_active"}} + ) +}); + +[ +{ "_id" : "alabama", "display_name" : "Alabama" }, +{ "_id" : "cfl", "display_name" : "Central Florida" }, +{ "_id" : "chicago", "display_name" : "Chicago" }, +{ "_id" : "georgia", "display_name" : "Georgia", "ranking_activity_day_limit" : 60, "ranking_num_tourneys_attended" : 1, "tournament_qualified_day_limit" : 60 }, +{ "_id" : "georgiateams", "display_name" : "GeorgiaTeams" }, +{ "_id" : "li", "display_name" : "Long Island" }, +{ "_id" : "newjersey", "display_name" : "New Jersey", "ranking_activity_day_limit" : 172, "ranking_num_tourneys_attended" : 2, "tournament_qualified_day_limit" : 172 }, +{ "_id" : "northcarolina", "display_name" : "North Carolina" }, +{ "_id" : "nyc", "display_name" : "NYC Metro Area" }, +{ "_id" : "nyc64", "display_name" : "NYC Smash 64" }, +{ "_id" : "philadelphia", "display_name" : "Philadelphia" }, +{ "_id" : "pittsburgh", "display_name" : "Pittsburgh" }, +{ "_id" : "southcarolina", "display_name" : "South Carolina" }, +{ "_id" : "westchester", "display_name" : "Westchester" } +] \ No newline at end of file From 93129236a9042d31e67713da73c36789397779ad Mon Sep 17 00:00:00 2001 From: "github.user-at-576386355408" Date: Sat, 3 Feb 2018 10:46:08 -0500 Subject: [PATCH 2/3] Removing accidental addition made to the merges view --- webapp/app/players/views/merges.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/app/players/views/merges.html b/webapp/app/players/views/merges.html index 2ea9a33..ed3ed06 100644 --- a/webapp/app/players/views/merges.html +++ b/webapp/app/players/views/merges.html @@ -21,7 +21,7 @@

Undo Merges

Merged On - + {{merge.source_player_name}} {{merge.target_player_name}} {{merge.requester_user_id}} From 2d52d6ae35f850a10b139b4ce99760f908204379 Mon Sep 17 00:00:00 2001 From: "github.user-at-576386355408" Date: Sat, 3 Feb 2018 10:50:43 -0500 Subject: [PATCH 3/3] Accidentally committed a scratch document --- .../views/var r = db.regions.find(); | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 webapp/app/tournaments/views/var r = db.regions.find(); diff --git a/webapp/app/tournaments/views/var r = db.regions.find(); b/webapp/app/tournaments/views/var r = db.regions.find(); deleted file mode 100644 index de4776c..0000000 --- a/webapp/app/tournaments/views/var r = db.regions.find(); +++ /dev/null @@ -1,25 +0,0 @@ -var r = db.regions.find(); - -r.forEach(region => { - db.regions.update( - {_id: region._id}, - {$rename: {"activeTF": "is_active"}} - ) -}); - -[ -{ "_id" : "alabama", "display_name" : "Alabama" }, -{ "_id" : "cfl", "display_name" : "Central Florida" }, -{ "_id" : "chicago", "display_name" : "Chicago" }, -{ "_id" : "georgia", "display_name" : "Georgia", "ranking_activity_day_limit" : 60, "ranking_num_tourneys_attended" : 1, "tournament_qualified_day_limit" : 60 }, -{ "_id" : "georgiateams", "display_name" : "GeorgiaTeams" }, -{ "_id" : "li", "display_name" : "Long Island" }, -{ "_id" : "newjersey", "display_name" : "New Jersey", "ranking_activity_day_limit" : 172, "ranking_num_tourneys_attended" : 2, "tournament_qualified_day_limit" : 172 }, -{ "_id" : "northcarolina", "display_name" : "North Carolina" }, -{ "_id" : "nyc", "display_name" : "NYC Metro Area" }, -{ "_id" : "nyc64", "display_name" : "NYC Smash 64" }, -{ "_id" : "philadelphia", "display_name" : "Philadelphia" }, -{ "_id" : "pittsburgh", "display_name" : "Pittsburgh" }, -{ "_id" : "southcarolina", "display_name" : "South Carolina" }, -{ "_id" : "westchester", "display_name" : "Westchester" } -] \ No newline at end of file