Merge branch 'master' of https://github.com/LukeShu/leaguer

2 files changed, 46 insertions, 27 deletions

diff --git a/doc/Sprint2-Retrospective.md b/doc/Sprint2-Retrospective.md
index 518a34e..db726f5 100644
--- a/doc/Sprint2-Retrospective.md
+++ b/doc/Sprint2-Retrospective.md
@@ -3,32 +3,6 @@ title: "Team 6 - Project Leaguer: Sprint 2 Retrospective"
 author: [ Nathaniel Foy, Guntas Grewal, Tomer Kimia, Andrew Murrell, Luke Shumaker, Davis Webb ]
 ---
 
-# User Stories
-
-1) As a user, I would like intelligent error handling and 404 redirection.
-
-2) As a user, I would like a working search utility.
-
-3) As a player, I would like a way to enter my usernames for several different remote games.
-
-4) As an admin I would like an option and utility to require email verification for users.
-
-5) As a host, I would like to have multiple options for scoring.
-
-6) As a host, I would like to have multiple tournament structures and types for pairing and running tournaments.
-
-7) As a host, I would like to have an interface for adding tournament-specific preferences.
-
-8) As a host, I would like to allow a wider variety of kinds of settings to be set.
-
-9) As a user, I would like the Riot API to be asynchronously polled in the background so League of Legends tournaments proceed automatically.
-
-10) As a user, I would like to view and create brackets.
-
-11) As a user, I would like the web interface to look more professional.
-
-12) As a host or player, I would like a larger set of peer evaluation settings.
-
 # Tasks
 
 The "size" is using the modified Fibonacci scale.  A '1' is expected
@@ -104,6 +78,10 @@ several days.
 ## Implement Anti-spam measures {#anti-spam}   
 ## Implement Teammate Rating System (peer review view) {#peer-review}
 ## Design/Code Scoring/Pairing Algorithms and Procedures {#pair-alg}
+
+Several Scoring Algorithms were considered and a modified fibonachi peer review
+system was chosen to 
+
 ## Implement game-type specific and tournament specific settings and preferences
    {(#setting-and-pref)}
 
@@ -127,9 +105,20 @@ on implementing a remote user id to link users Leaguer information to their Riot
 information.
 
 ## Teach Andrew and Tomer AJAX {#teach-ajax}
+
+Luke instructed Tomer on his AJAX tasks, but most of Andrew's were deferred to
+sprint 3 and he focused his efforts elsewhere.
+
 ## Make pages auto-update with AJAX  {#ajax}
+
+AJAX was used in tournament and match views to update the tournament progress bar
+and manage input options for tournament flow but still needs to be implemented 
+across the website in other areas.
+
 ## Setting up a Tournament View for matches and tree {#match-gui}
 
+
+
 ## Increase Usability  {#usability}
 
 Project Leaguer has many new features that have increased usability. AJAX
@@ -139,6 +128,10 @@ web interface available for our users to utilize.
 
 ## Develop comprehensive data storage for s&p&other{#data-storage}
 
+Settings and Preferences (those options specific to tournaments of a game type
+or a specific tournament, respectively) are handled through a single
+TournamentPreference SQL (ActiveRecord) interface.
+
 ## Create Player Profile Pages {#profile}
 
 Player Profile Pages successfully list important and useful user information.
diff --git a/doc/sprint3.md b/doc/sprint3.md
index ed0f3bb..d3696ee 100644
--- a/doc/sprint3.md
+++ b/doc/sprint3.md
@@ -22,6 +22,32 @@ author: [ Nathaniel Foy, Guntas Grewal, Tomer Kimia, Andrew Murrell, Luke Shumak
 
 7) As a user, I would like to be able to send private messages.
 
+# User Stories
+
+1) As a user, I would like intelligent error handling and 404 redirection.
+
+2) As a user, I would like a working search utility.
+
+3) As a player, I would like a way to enter my usernames for several different remote games.
+
+4) As an admin I would like an option and utility to require email verification for users.
+
+5) As a host, I would like to have multiple options for scoring.
+
+6) As a host, I would like to have multiple tournament structures and types for pairing and running tournaments.
+
+7) As a host, I would like to have an interface for adding tournament-specific preferences.
+
+8) As a host, I would like to allow a wider variety of kinds of settings to be set.
+
+9) As a user, I would like the Riot API to be asynchronously polled in the background so League of Legends tournaments proceed automatically.
+
+10) As a user, I would like to view and create brackets.
+
+11) As a user, I would like the web interface to look more professional.
+
+12) As a host or player, I would like a larger set of peer evaluation settings.
+
 
 #Tasks
 
@@ -62,4 +88,4 @@ several days.
 | Private Messages                                        |      |            |    |
 +---------------------------------------------------------+------+------------+----+
 | Alerts                                                  |      |            |    |
-+---------------------------------------------------------+------+------------+----+
\ No newline at end of file
++---------------------------------------------------------+------+------------+----+