BigBad / golfleague

app/library/Storage/TeamMatchesRepository.php

Indentation +5 added lines, -5 removed lines

@@ -11,9 +11,9 @@
 
 interface TeamMatchesRepository
 {
-    public function all();
-    public function findById($id);
-    public function create($input);
-    public function update($team);
-    public function getByMatch($matchId);
+	public function all();
+	public function findById($id);
+	public function create($input);
+	public function update($team);
+	public function getByMatch($matchId);
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -9,8 +9,7 @@
 namespace GolfLeague\Storage\Team;
 
 
-interface TeamMatchesRepository
-{
+interface TeamMatchesRepository {
     public function all();
     public function findById($id);
     public function create($input);

app/library/Handlers/TeamMatchHandler.php

Indentation +33 added lines, -33 removed lines

@@ -11,37 +11,37 @@
 
 class TeamMatchHandler
 {
-    /**
-     * Create a new instance of the TeamMatchHandler
-     *
-     * @param
-     * @return void
-     */
-    public function __construct()
-    {
-
-    } // End of __construct
-
-    /**
-     * Create an initial round for each player after a new match is created
-     *
-     * @param  Match $match
-     * @return void
-     */
-    public function handle($match)
-    {
-
-
-    }
-
-    /**
-     * Register the listeners for the subscriber.
-     *
-     * @param  Illuminate\Events\Dispatcher $events
-     * @return array
-     */
-    public function subscribe($events)
-    {
-        $events->listen('match.create', 'GolfLeague\Handlers\TeamMatchHandler');
-    }
+	/**
+	 * Create a new instance of the TeamMatchHandler
+	 *
+	 * @param
+	 * @return void
+	 */
+	public function __construct()
+	{
+
+	} // End of __construct
+
+	/**
+	 * Create an initial round for each player after a new match is created
+	 *
+	 * @param  Match $match
+	 * @return void
+	 */
+	public function handle($match)
+	{
+
+
+	}
+
+	/**
+	 * Register the listeners for the subscriber.
+	 *
+	 * @param  Illuminate\Events\Dispatcher $events
+	 * @return array
+	 */
+	public function subscribe($events)
+	{
+		$events->listen('match.create', 'GolfLeague\Handlers\TeamMatchHandler');
+	}
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -9,8 +9,7 @@
 namespace GolfLeague\Handlers;
 
 
-class TeamMatchHandler
-{
+class TeamMatchHandler {
     /**
      * Create a new instance of the TeamMatchHandler
      *

app/library/Handlers/TeamMatchServiceProvider.php

Indentation +16 added lines, -16 removed lines

@@ -11,23 +11,23 @@
 
 class TeamMatchServiceProvider
 {
-    public function register()
-    {
+	public function register()
+	{
 
-    }
+	}
 
-    /**
-     * Boot the Match Events
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->app->events->subscribe(
-            new TeamMatchHandler(
-                //$this->app->make('GolfLeague\Storage\Round\RoundRepository')
-            )
-        );
-    }
+	/**
+	 * Boot the Match Events
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->app->events->subscribe(
+			new TeamMatchHandler(
+				//$this->app->make('GolfLeague\Storage\Round\RoundRepository')
+			)
+		);
+	}
 
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -9,8 +9,7 @@
 namespace GolfLeague\Handlers;
 
 
-class TeamMatchServiceProvider
-{
+class TeamMatchServiceProvider {
     public function register()
     {
 

app/library/Classes/Games/TeamNet.php

Braces +1 added lines, -2 removed lines

@@ -9,7 +9,6 @@
 namespace GolfLeague\Games;
 
 
-class TeamNet
-{
+class TeamNet {
 
 }
\ No newline at end of file

app/library/Classes/Handicap.php

Braces +2 added lines, -3 removed lines

@@ -5,8 +5,7 @@ 
 use \Player as Player;
 use \Round as Round;
 
-class Handicap
-{
+class Handicap {
     private $differentialArray;
     private $player;
     private $roundsUsed;
@@ -42,7 +41,7 @@ 
     //
     public function differential($numberOfScores)
     {
-        if($numberOfScores <= 20){
+        if($numberOfScores <= 20) {
             return $this->differentialArray[$numberOfScores];
         } else {
             return $this->differentialArray[20];

Indentation +41 added lines, -41 removed lines

@@ -7,47 +7,47 @@
 
 class Handicap
 {
-    private $differentialArray;
-    private $player;
-    private $roundsUsed;
-
-    public function __construct(Player $player, $roundsUsed = 10)
-    {
-        $this->differentialArray = array(0,1,1,1,1,1,1,2,2,3,3,4,4,5,5,6,6,7,8,9,10);
-        $this->player = $player;
-        $this->roundsUsed = $roundsUsed; //20 is USGA standard;  Some leagues may want to adjust.
-    }
-
-    public function calculate()
-    {
-        $rounds = Round::where('player_id', '=', $this->player->id)->orderBy('date', 'desc')->take($this->roundsUsed)->get();
-        $differential = $this->differential($rounds->count());
-
-        $i = 1;
-        foreach ($rounds as $round) {
-            $differentials[$i]  = $round->esc;
-            $i++;
-        }
-        sort($differentials);
-        $chunkedRounds = array_chunk($differentials,$differential,true);
-        $roundsUsed = $chunkedRounds[0];
-
-        $sumofDifferentials = array_sum($roundsUsed);
-        $handicap = (($sumofDifferentials / $differential) * .96) - 36;
-        $handicap = round($handicap ,2);
-
-        return $handicap;
-    }
-
-    //
-    public function differential($numberOfScores)
-    {
-        if($numberOfScores <= 20){
-            return $this->differentialArray[$numberOfScores];
-        } else {
-            return $this->differentialArray[20];
-        }
-    }
+	private $differentialArray;
+	private $player;
+	private $roundsUsed;
+
+	public function __construct(Player $player, $roundsUsed = 10)
+	{
+		$this->differentialArray = array(0,1,1,1,1,1,1,2,2,3,3,4,4,5,5,6,6,7,8,9,10);
+		$this->player = $player;
+		$this->roundsUsed = $roundsUsed; //20 is USGA standard;  Some leagues may want to adjust.
+	}
+
+	public function calculate()
+	{
+		$rounds = Round::where('player_id', '=', $this->player->id)->orderBy('date', 'desc')->take($this->roundsUsed)->get();
+		$differential = $this->differential($rounds->count());
+
+		$i = 1;
+		foreach ($rounds as $round) {
+			$differentials[$i]  = $round->esc;
+			$i++;
+		}
+		sort($differentials);
+		$chunkedRounds = array_chunk($differentials,$differential,true);
+		$roundsUsed = $chunkedRounds[0];
+
+		$sumofDifferentials = array_sum($roundsUsed);
+		$handicap = (($sumofDifferentials / $differential) * .96) - 36;
+		$handicap = round($handicap ,2);
+
+		return $handicap;
+	}
+
+	//
+	public function differential($numberOfScores)
+	{
+		if($numberOfScores <= 20){
+			return $this->differentialArray[$numberOfScores];
+		} else {
+			return $this->differentialArray[20];
+		}
+	}
 
 
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -13,7 +13,7 @@ 
 
     public function __construct(Player $player, $roundsUsed = 10)
     {
-        $this->differentialArray = array(0,1,1,1,1,1,1,2,2,3,3,4,4,5,5,6,6,7,8,9,10);
+        $this->differentialArray = array(0, 1, 1, 1, 1, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 8, 9, 10);
         $this->player = $player;
         $this->roundsUsed = $roundsUsed; //20 is USGA standard;  Some leagues may want to adjust.
     }
@@ -25,16 +25,16 @@ 
 
         $i = 1;
         foreach ($rounds as $round) {
-            $differentials[$i]  = $round->esc;
+            $differentials[$i] = $round->esc;
             $i++;
         }
         sort($differentials);
-        $chunkedRounds = array_chunk($differentials,$differential,true);
+        $chunkedRounds = array_chunk($differentials, $differential, true);
         $roundsUsed = $chunkedRounds[0];
 
         $sumofDifferentials = array_sum($roundsUsed);
         $handicap = (($sumofDifferentials / $differential) * .96) - 36;
-        $handicap = round($handicap ,2);
+        $handicap = round($handicap, 2);
 
         return $handicap;
     }
@@ -42,7 +42,7 @@ 
     //
     public function differential($numberOfScores)
     {
-        if($numberOfScores <= 20){
+        if ($numberOfScores <= 20) {
             return $this->differentialArray[$numberOfScores];
         } else {
             return $this->differentialArray[20];

app/controllers/TeamMatchesController.php

Indentation +263 added lines, -263 removed lines

@@ -6,14 +6,14 @@ 
 
 class TeamMatchesController extends \BaseController {
 
-    public function __construct(MatchService $match, MatchRoundRepository $matchRoundRepo, TeamMatchesRepository $teamMatchesRepository)
-    {
-        $this->match = $match;
-        $this->matchRoundRepo = $matchRoundRepo;
-        $this->teamMatchesRepo = $teamMatchesRepository;
-    }
-
-    /**
+	public function __construct(MatchService $match, MatchRoundRepository $matchRoundRepo, TeamMatchesRepository $teamMatchesRepository)
+	{
+		$this->match = $match;
+		$this->matchRoundRepo = $matchRoundRepo;
+		$this->teamMatchesRepo = $teamMatchesRepository;
+	}
+
+	/**
 	 * Display a listing of the resource.
 	 *
 	 * @return Response
@@ -56,249 +56,249 @@ 
 	{
 
 
-        $group = Input::get('group');
-
+		$group = Input::get('group');
+
 
-        $groupPlayers = $this->matchRoundRepo->matchGroup($id, $group);
+		$groupPlayers = $this->matchRoundRepo->matchGroup($id, $group);
 
-        //Create Player data
-        $matchUp = array();
-        foreach($groupPlayers as $key=>$groupPlayer){
-            $matchUp[$key]['player'] = $groupPlayer->pivot->player_id;
-            $matchUp[$key]['matchHandicap'] = round($groupPlayer->pivot->handicap ,0);
-            foreach ($groupPlayer->round as $round){
-                $matchUp[$key]['team'] = $round->team_id;
-                $matchUp[$key]['course'] = $round->course_id;
-                $matchUp[$key]['holescores'] = $round->holescores;
-            }
-
-        }
-
-        // Change lowest handicap to ZERO and change others to reflect it
-            foreach($matchUp as $key=>$match){
-                $matchHandicaps[] = $match['matchHandicap'];
-            }
-            $lowestMatchHandicap = min($matchHandicaps);
-            //handicap change
-            $handicapChange = $lowestMatchHandicap * -1;
-            foreach($matchUp as $key=>$match){
-                $matchUp[$key]['matchHandicap'] = $match['matchHandicap'] + $handicapChange;
-            }
-
-
-        // Separate two teams
-
-        foreach($matchUp as $key=>$item){
-            $teamIds[$key] = $item['team'];
-        }
-        sort($teamIds);
-        $teamIds = array_slice($teamIds, 1, -1);
-        $team1Id = $teamIds[0];
-        $team2Id = $teamIds[1];
-
-        $team1 = array();
-        $team2 = array();
-
-        foreach($matchUp as $key=>$match){
-            if($match['team'] ==$team1Id ){
-                $team1[] = $matchUp[$key];
-            } else {
-                $team2[] = $matchUp[$key];
-            }
-        }
-
-
-        $team1Name = Team::select('name')->where('id', '=', $team1Id)->get()->toArray();
-        foreach($matchUp as $key=>$match){
-            if($match['team'] == $team1[0]['team']){
-                $team1[] = $match;
-                unset($matchUp[$key]);
-            }
-        }
-
-        $team2 = $matchUp;
-
-        $team2Name = Team::select('name')->where('id', '=', $team2Id)->get()->toArray();
-
-            $holesData = Hole::select('handicap')->where('course_id', '=', $team1[0]['course'])->get();
-
-            $team1Scores = $this->getTeamNetScore($team1, $holesData);
-            $team2Scores = $this->getTeamNetScore($team2, $holesData);
-
-            $team1Points = $this->calculatePoints($team1Scores, $team2Scores);
-            $team2Points = $this->calculatePoints($team2Scores, $team1Scores);
-
-            // Bonus point logic
-            // Occurs after 9th hole score is added to both teams
-
-            $team1Bonus = null;
-            $team2Bonus = null;
-
-            if($team1Scores[8] != null && $team2Scores[8] != null){
-                if($team1Points > $team2Points){
-                    $team1Points = $team1Points + 1;
-                    $team1Bonus = 1;
-                }
-                if($team2Points > $team1Points){
-                    $team2Points = $team2Points + 1;
-                    $team2Bonus = 1;
-                }
-                if($team1Points == $team2Points){
-                    $team1Points = $team1Points + .5;
-                    $team1Bonus = .5;
-                    $team2Points = $team2Points + .5;
-                    $team2Bonus = .5;
-                }
-            }
-
-            //Save Points in Teammatches
-            Teammatch::where('match_id', '=', $id)->where('team_id', '=', $team1Id)->update(array('pointsWon' => $team1Points));
-            Teammatch::where('match_id', '=', $id)->where('team_id', '=', $team2Id)->update(array('pointsWon' => $team2Points));
-
-
-        //Need to determine if same amount of scores are in both
-        // If not then do not return
-
-        foreach($team1Scores as $key=>$teamScore){
-            if($teamScore <= 0){
-                $team1Scores[$key] = '';
-            }
-        }
-        $team1Net = array_sum($team1Scores);
-
-
-        foreach($team2Scores as $key=>$teamScore){
-            if($teamScore <= 0){
-                $team2Scores[$key] = '';
-            }
-        }
-        $team2Net = array_sum($team2Scores);
-
-
-        $team[0] = [
-            "team" =>  $team1Name[0]['name'],
-            "hole1" => $team1Scores[0],
-            "hole2" => $team1Scores[1],
-            "hole3" => $team1Scores[2],
-            "hole4" => $team1Scores[3],
-            "hole5" => $team1Scores[4],
-            "hole6" => $team1Scores[5],
-            "hole7" => $team1Scores[6],
-            "hole8" => $team1Scores[7],
-            "hole9" => $team1Scores[8],
-            "bonus" => $team1Bonus,
-            "points" => $team1Points,
-            "netscore" => $team1Net
-        ];
-
-        $team[1] = [
-            "team" =>  $team2Name[0]['name'],
-            "hole1" => $team2Scores[0],
-            "hole2" => $team2Scores[1],
-            "hole3" => $team2Scores[2],
-            "hole4" => $team2Scores[3],
-            "hole5" => $team2Scores[4],
-            "hole6" => $team2Scores[5],
-            "hole7" => $team2Scores[6],
-            "hole8" => $team2Scores[7],
-            "hole9" => $team2Scores[8],
-            "bonus" => $team2Bonus,
-            "points" => $team2Points,
-            "netscore" => $team2Net,
-        ];
-
-        $data['data'] = $team;
-        return $data;
+		//Create Player data
+		$matchUp = array();
+		foreach($groupPlayers as $key=>$groupPlayer){
+			$matchUp[$key]['player'] = $groupPlayer->pivot->player_id;
+			$matchUp[$key]['matchHandicap'] = round($groupPlayer->pivot->handicap ,0);
+			foreach ($groupPlayer->round as $round){
+				$matchUp[$key]['team'] = $round->team_id;
+				$matchUp[$key]['course'] = $round->course_id;
+				$matchUp[$key]['holescores'] = $round->holescores;
+			}
+
+		}
+
+		// Change lowest handicap to ZERO and change others to reflect it
+			foreach($matchUp as $key=>$match){
+				$matchHandicaps[] = $match['matchHandicap'];
+			}
+			$lowestMatchHandicap = min($matchHandicaps);
+			//handicap change
+			$handicapChange = $lowestMatchHandicap * -1;
+			foreach($matchUp as $key=>$match){
+				$matchUp[$key]['matchHandicap'] = $match['matchHandicap'] + $handicapChange;
+			}
+
+
+		// Separate two teams
+
+		foreach($matchUp as $key=>$item){
+			$teamIds[$key] = $item['team'];
+		}
+		sort($teamIds);
+		$teamIds = array_slice($teamIds, 1, -1);
+		$team1Id = $teamIds[0];
+		$team2Id = $teamIds[1];
+
+		$team1 = array();
+		$team2 = array();
+
+		foreach($matchUp as $key=>$match){
+			if($match['team'] ==$team1Id ){
+				$team1[] = $matchUp[$key];
+			} else {
+				$team2[] = $matchUp[$key];
+			}
+		}
+
+
+		$team1Name = Team::select('name')->where('id', '=', $team1Id)->get()->toArray();
+		foreach($matchUp as $key=>$match){
+			if($match['team'] == $team1[0]['team']){
+				$team1[] = $match;
+				unset($matchUp[$key]);
+			}
+		}
+
+		$team2 = $matchUp;
+
+		$team2Name = Team::select('name')->where('id', '=', $team2Id)->get()->toArray();
+
+			$holesData = Hole::select('handicap')->where('course_id', '=', $team1[0]['course'])->get();
+
+			$team1Scores = $this->getTeamNetScore($team1, $holesData);
+			$team2Scores = $this->getTeamNetScore($team2, $holesData);
+
+			$team1Points = $this->calculatePoints($team1Scores, $team2Scores);
+			$team2Points = $this->calculatePoints($team2Scores, $team1Scores);
+
+			// Bonus point logic
+			// Occurs after 9th hole score is added to both teams
+
+			$team1Bonus = null;
+			$team2Bonus = null;
+
+			if($team1Scores[8] != null && $team2Scores[8] != null){
+				if($team1Points > $team2Points){
+					$team1Points = $team1Points + 1;
+					$team1Bonus = 1;
+				}
+				if($team2Points > $team1Points){
+					$team2Points = $team2Points + 1;
+					$team2Bonus = 1;
+				}
+				if($team1Points == $team2Points){
+					$team1Points = $team1Points + .5;
+					$team1Bonus = .5;
+					$team2Points = $team2Points + .5;
+					$team2Bonus = .5;
+				}
+			}
+
+			//Save Points in Teammatches
+			Teammatch::where('match_id', '=', $id)->where('team_id', '=', $team1Id)->update(array('pointsWon' => $team1Points));
+			Teammatch::where('match_id', '=', $id)->where('team_id', '=', $team2Id)->update(array('pointsWon' => $team2Points));
+
+
+		//Need to determine if same amount of scores are in both
+		// If not then do not return
+
+		foreach($team1Scores as $key=>$teamScore){
+			if($teamScore <= 0){
+				$team1Scores[$key] = '';
+			}
+		}
+		$team1Net = array_sum($team1Scores);
+
+
+		foreach($team2Scores as $key=>$teamScore){
+			if($teamScore <= 0){
+				$team2Scores[$key] = '';
+			}
+		}
+		$team2Net = array_sum($team2Scores);
+
+
+		$team[0] = [
+			"team" =>  $team1Name[0]['name'],
+			"hole1" => $team1Scores[0],
+			"hole2" => $team1Scores[1],
+			"hole3" => $team1Scores[2],
+			"hole4" => $team1Scores[3],
+			"hole5" => $team1Scores[4],
+			"hole6" => $team1Scores[5],
+			"hole7" => $team1Scores[6],
+			"hole8" => $team1Scores[7],
+			"hole9" => $team1Scores[8],
+			"bonus" => $team1Bonus,
+			"points" => $team1Points,
+			"netscore" => $team1Net
+		];
+
+		$team[1] = [
+			"team" =>  $team2Name[0]['name'],
+			"hole1" => $team2Scores[0],
+			"hole2" => $team2Scores[1],
+			"hole3" => $team2Scores[2],
+			"hole4" => $team2Scores[3],
+			"hole5" => $team2Scores[4],
+			"hole6" => $team2Scores[5],
+			"hole7" => $team2Scores[6],
+			"hole8" => $team2Scores[7],
+			"hole9" => $team2Scores[8],
+			"bonus" => $team2Bonus,
+			"points" => $team2Points,
+			"netscore" => $team2Net,
+		];
+
+		$data['data'] = $team;
+		return $data;
 	}
 
-    private function getTeamNetScore($team, $holesData)
-    {
-        foreach($team as $key=>$item){
-            // Create holes array for NET
-            $holes = array();
-            $i = 1;
-            foreach($holesData as $key=>$holeData){
-                $holes[$i] = $holeData->handicap;
-                $i++;
-            }
-
-            // Create stroke array - how many to take away from score
-            $strokeArray = [
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 0,
-                9 => 0
-            ];
-            //Create array of strokes
-            for($counter = $item['matchHandicap']; $counter > 0; $counter--){
-                if($counter > 9){
-                    $newCounter = $counter - 9;
-                    while($newCounter > 0) {
-                        $strokeArray[$newCounter] = $strokeArray[$newCounter] + 1;
-                        $counter--;
-                        $newCounter--;
-                    }
-                }
-                $strokeArray[$counter] = $strokeArray[$counter] + 1;
-            }
-            // Plus handicaps don't hit previous loop so need its own
-            //Plus handicap logic
-
-            foreach($strokeArray as $strokeKey=>$stroke){
-                $holeKey = array_search($strokeKey,$holes);
-                $holes[$holeKey] = $stroke;
-            }
-
-            ///now have array of strokes to subtract
-            //get array of holescores
-
-            $holeScores = $item['holescores'];
-            foreach($holeScores as $key=>$holeScore){
-                //check if new score is less PlayerScores
-                if(isset($teamScores[$key])){ // 2nd time in for hole
-
-                    //set temp handi score
-                    $tempScore = $holeScore['score'] - $holes[$key+1];
-                    if($teamScores[$key] >= $tempScore){
-                        $teamScores[$key] = $holeScore['score'] - $holes[$key+1];
-                    }
-                } else{ // first time in for hole
-                    if($holeScore['score'] != null){
-                        $teamScores[$key] = $holeScore['score'] - $holes[$key+1];
-                    } else{
-                        $teamScores[$key] = null;
-                    }
-                }
-            }
-
-        }
-        return $teamScores;
-    }
-
-    private function calculatePoints($team, $opponent)
-    {
-        $points = 0;
-        $teamTotalPoints = 0;
-        $opponentTotalPoints = 0;
-        foreach ($team as $key=>$score){
-            if($score != null){
-                if($score < $opponent[$key]){
-                    $points++;
-                }
-                if($score == $opponent[$key]){
-                    $points = $points + .5;
-                }
-            }
-
-        }
-
-        return $points;
-    }
+	private function getTeamNetScore($team, $holesData)
+	{
+		foreach($team as $key=>$item){
+			// Create holes array for NET
+			$holes = array();
+			$i = 1;
+			foreach($holesData as $key=>$holeData){
+				$holes[$i] = $holeData->handicap;
+				$i++;
+			}
+
+			// Create stroke array - how many to take away from score
+			$strokeArray = [
+				1 => 0,
+				2 => 0,
+				3 => 0,
+				4 => 0,
+				5 => 0,
+				6 => 0,
+				7 => 0,
+				8 => 0,
+				9 => 0
+			];
+			//Create array of strokes
+			for($counter = $item['matchHandicap']; $counter > 0; $counter--){
+				if($counter > 9){
+					$newCounter = $counter - 9;
+					while($newCounter > 0) {
+						$strokeArray[$newCounter] = $strokeArray[$newCounter] + 1;
+						$counter--;
+						$newCounter--;
+					}
+				}
+				$strokeArray[$counter] = $strokeArray[$counter] + 1;
+			}
+			// Plus handicaps don't hit previous loop so need its own
+			//Plus handicap logic
+
+			foreach($strokeArray as $strokeKey=>$stroke){
+				$holeKey = array_search($strokeKey,$holes);
+				$holes[$holeKey] = $stroke;
+			}
+
+			///now have array of strokes to subtract
+			//get array of holescores
+
+			$holeScores = $item['holescores'];
+			foreach($holeScores as $key=>$holeScore){
+				//check if new score is less PlayerScores
+				if(isset($teamScores[$key])){ // 2nd time in for hole
+
+					//set temp handi score
+					$tempScore = $holeScore['score'] - $holes[$key+1];
+					if($teamScores[$key] >= $tempScore){
+						$teamScores[$key] = $holeScore['score'] - $holes[$key+1];
+					}
+				} else{ // first time in for hole
+					if($holeScore['score'] != null){
+						$teamScores[$key] = $holeScore['score'] - $holes[$key+1];
+					} else{
+						$teamScores[$key] = null;
+					}
+				}
+			}
+
+		}
+		return $teamScores;
+	}
+
+	private function calculatePoints($team, $opponent)
+	{
+		$points = 0;
+		$teamTotalPoints = 0;
+		$opponentTotalPoints = 0;
+		foreach ($team as $key=>$score){
+			if($score != null){
+				if($score < $opponent[$key]){
+					$points++;
+				}
+				if($score == $opponent[$key]){
+					$points = $points + .5;
+				}
+			}
+
+		}
+
+		return $points;
+	}
 
 	/**
 	 * Show the form for editing the specified resource.
@@ -336,22 +336,22 @@ 
 	}
 
 	public function getPointsByYear($year)
-    {
-        $teamMatches = Teammatch::select('team_id','pointsWon')->whereYear('created_at', '=', $year)->with('team')->get();
-        foreach($teamMatches as $key=>$teamMatch){
-            $pointsData[$key]['name'] = $teamMatch['team']['name'];
-            $pointsData[$key]['points'] =  Teammatch::select('team_id','pointsWon')
-                ->where('team_id', '=', $teamMatch->team_id)
-                ->whereYear('created_at', '=', $year)
-                ->with('team')
-                ->sum('pointsWon');
-
-        }
-
-        $pointsData = array_map("unserialize", array_unique(array_map("serialize", $pointsData)));
-        $data['data'] = $pointsData;
-        return $data;
-    }
+	{
+		$teamMatches = Teammatch::select('team_id','pointsWon')->whereYear('created_at', '=', $year)->with('team')->get();
+		foreach($teamMatches as $key=>$teamMatch){
+			$pointsData[$key]['name'] = $teamMatch['team']['name'];
+			$pointsData[$key]['points'] =  Teammatch::select('team_id','pointsWon')
+				->where('team_id', '=', $teamMatch->team_id)
+				->whereYear('created_at', '=', $year)
+				->with('team')
+				->sum('pointsWon');
+
+		}
+
+		$pointsData = array_map("unserialize", array_unique(array_map("serialize", $pointsData)));
+		$data['data'] = $pointsData;
+		return $data;
+	}
 
 
 }

Spacing +41 added lines, -41 removed lines

@@ -63,10 +63,10 @@ 
 
         //Create Player data
         $matchUp = array();
-        foreach($groupPlayers as $key=>$groupPlayer){
+        foreach ($groupPlayers as $key=>$groupPlayer) {
             $matchUp[$key]['player'] = $groupPlayer->pivot->player_id;
-            $matchUp[$key]['matchHandicap'] = round($groupPlayer->pivot->handicap ,0);
-            foreach ($groupPlayer->round as $round){
+            $matchUp[$key]['matchHandicap'] = round($groupPlayer->pivot->handicap, 0);
+            foreach ($groupPlayer->round as $round) {
                 $matchUp[$key]['team'] = $round->team_id;
                 $matchUp[$key]['course'] = $round->course_id;
                 $matchUp[$key]['holescores'] = $round->holescores;
@@ -75,20 +75,20 @@ 
         }
 
         // Change lowest handicap to ZERO and change others to reflect it
-            foreach($matchUp as $key=>$match){
+            foreach ($matchUp as $key=>$match) {
                 $matchHandicaps[] = $match['matchHandicap'];
             }
             $lowestMatchHandicap = min($matchHandicaps);
             //handicap change
             $handicapChange = $lowestMatchHandicap * -1;
-            foreach($matchUp as $key=>$match){
+            foreach ($matchUp as $key=>$match) {
                 $matchUp[$key]['matchHandicap'] = $match['matchHandicap'] + $handicapChange;
             }
 
 
         // Separate two teams
 
-        foreach($matchUp as $key=>$item){
+        foreach ($matchUp as $key=>$item) {
             $teamIds[$key] = $item['team'];
         }
         sort($teamIds);
@@ -99,8 +99,8 @@ 
         $team1 = array();
         $team2 = array();
 
-        foreach($matchUp as $key=>$match){
-            if($match['team'] ==$team1Id ){
+        foreach ($matchUp as $key=>$match) {
+            if ($match['team'] == $team1Id) {
                 $team1[] = $matchUp[$key];
             } else {
                 $team2[] = $matchUp[$key];
@@ -109,8 +109,8 @@ 
 
 
         $team1Name = Team::select('name')->where('id', '=', $team1Id)->get()->toArray();
-        foreach($matchUp as $key=>$match){
-            if($match['team'] == $team1[0]['team']){
+        foreach ($matchUp as $key=>$match) {
+            if ($match['team'] == $team1[0]['team']) {
                 $team1[] = $match;
                 unset($matchUp[$key]);
             }
@@ -134,16 +134,16 @@ 
             $team1Bonus = null;
             $team2Bonus = null;
 
-            if($team1Scores[8] != null && $team2Scores[8] != null){
-                if($team1Points > $team2Points){
+            if ($team1Scores[8] != null && $team2Scores[8] != null) {
+                if ($team1Points > $team2Points) {
                     $team1Points = $team1Points + 1;
                     $team1Bonus = 1;
                 }
-                if($team2Points > $team1Points){
+                if ($team2Points > $team1Points) {
                     $team2Points = $team2Points + 1;
                     $team2Bonus = 1;
                 }
-                if($team1Points == $team2Points){
+                if ($team1Points == $team2Points) {
                     $team1Points = $team1Points + .5;
                     $team1Bonus = .5;
                     $team2Points = $team2Points + .5;
@@ -159,16 +159,16 @@ 
         //Need to determine if same amount of scores are in both
         // If not then do not return
 
-        foreach($team1Scores as $key=>$teamScore){
-            if($teamScore <= 0){
+        foreach ($team1Scores as $key=>$teamScore) {
+            if ($teamScore <= 0) {
                 $team1Scores[$key] = '';
             }
         }
         $team1Net = array_sum($team1Scores);
 
 
-        foreach($team2Scores as $key=>$teamScore){
-            if($teamScore <= 0){
+        foreach ($team2Scores as $key=>$teamScore) {
+            if ($teamScore <= 0) {
                 $team2Scores[$key] = '';
             }
         }
@@ -213,11 +213,11 @@ 
 
     private function getTeamNetScore($team, $holesData)
     {
-        foreach($team as $key=>$item){
+        foreach ($team as $key=>$item) {
             // Create holes array for NET
             $holes = array();
             $i = 1;
-            foreach($holesData as $key=>$holeData){
+            foreach ($holesData as $key=>$holeData) {
                 $holes[$i] = $holeData->handicap;
                 $i++;
             }
@@ -235,10 +235,10 @@ 
                 9 => 0
             ];
             //Create array of strokes
-            for($counter = $item['matchHandicap']; $counter > 0; $counter--){
-                if($counter > 9){
+            for ($counter = $item['matchHandicap']; $counter > 0; $counter--) {
+                if ($counter > 9) {
                     $newCounter = $counter - 9;
-                    while($newCounter > 0) {
+                    while ($newCounter > 0) {
                         $strokeArray[$newCounter] = $strokeArray[$newCounter] + 1;
                         $counter--;
                         $newCounter--;
@@ -249,8 +249,8 @@ 
             // Plus handicaps don't hit previous loop so need its own
             //Plus handicap logic
 
-            foreach($strokeArray as $strokeKey=>$stroke){
-                $holeKey = array_search($strokeKey,$holes);
+            foreach ($strokeArray as $strokeKey=>$stroke) {
+                $holeKey = array_search($strokeKey, $holes);
                 $holes[$holeKey] = $stroke;
             }
 
@@ -258,19 +258,19 @@ 
             //get array of holescores
 
             $holeScores = $item['holescores'];
-            foreach($holeScores as $key=>$holeScore){
+            foreach ($holeScores as $key=>$holeScore) {
                 //check if new score is less PlayerScores
-                if(isset($teamScores[$key])){ // 2nd time in for hole
+                if (isset($teamScores[$key])) { // 2nd time in for hole
 
                     //set temp handi score
-                    $tempScore = $holeScore['score'] - $holes[$key+1];
-                    if($teamScores[$key] >= $tempScore){
-                        $teamScores[$key] = $holeScore['score'] - $holes[$key+1];
+                    $tempScore = $holeScore['score'] - $holes[$key + 1];
+                    if ($teamScores[$key] >= $tempScore) {
+                        $teamScores[$key] = $holeScore['score'] - $holes[$key + 1];
                     }
-                } else{ // first time in for hole
-                    if($holeScore['score'] != null){
-                        $teamScores[$key] = $holeScore['score'] - $holes[$key+1];
-                    } else{
+                } else { // first time in for hole
+                    if ($holeScore['score'] != null) {
+                        $teamScores[$key] = $holeScore['score'] - $holes[$key + 1];
+                    } else {
                         $teamScores[$key] = null;
                     }
                 }
@@ -285,12 +285,12 @@ 
         $points = 0;
         $teamTotalPoints = 0;
         $opponentTotalPoints = 0;
-        foreach ($team as $key=>$score){
-            if($score != null){
-                if($score < $opponent[$key]){
+        foreach ($team as $key=>$score) {
+            if ($score != null) {
+                if ($score < $opponent[$key]) {
                     $points++;
                 }
-                if($score == $opponent[$key]){
+                if ($score == $opponent[$key]) {
                     $points = $points + .5;
                 }
             }
@@ -337,10 +337,10 @@ 
 
 	public function getPointsByYear($year)
     {
-        $teamMatches = Teammatch::select('team_id','pointsWon')->whereYear('created_at', '=', $year)->with('team')->get();
-        foreach($teamMatches as $key=>$teamMatch){
+        $teamMatches = Teammatch::select('team_id', 'pointsWon')->whereYear('created_at', '=', $year)->with('team')->get();
+        foreach ($teamMatches as $key=>$teamMatch) {
             $pointsData[$key]['name'] = $teamMatch['team']['name'];
-            $pointsData[$key]['points'] =  Teammatch::select('team_id','pointsWon')
+            $pointsData[$key]['points'] = Teammatch::select('team_id', 'pointsWon')
                 ->where('team_id', '=', $teamMatch->team_id)
                 ->whereYear('created_at', '=', $year)
                 ->with('team')

Braces +36 added lines, -34 removed lines

@@ -63,10 +63,10 @@ 
 
         //Create Player data
         $matchUp = array();
-        foreach($groupPlayers as $key=>$groupPlayer){
+        foreach($groupPlayers as $key=>$groupPlayer) {
             $matchUp[$key]['player'] = $groupPlayer->pivot->player_id;
             $matchUp[$key]['matchHandicap'] = round($groupPlayer->pivot->handicap ,0);
-            foreach ($groupPlayer->round as $round){
+            foreach ($groupPlayer->round as $round) {
                 $matchUp[$key]['team'] = $round->team_id;
                 $matchUp[$key]['course'] = $round->course_id;
                 $matchUp[$key]['holescores'] = $round->holescores;
@@ -75,20 +75,20 @@ 
         }
 
         // Change lowest handicap to ZERO and change others to reflect it
-            foreach($matchUp as $key=>$match){
+            foreach($matchUp as $key=>$match) {
                 $matchHandicaps[] = $match['matchHandicap'];
             }
             $lowestMatchHandicap = min($matchHandicaps);
             //handicap change
             $handicapChange = $lowestMatchHandicap * -1;
-            foreach($matchUp as $key=>$match){
+            foreach($matchUp as $key=>$match) {
                 $matchUp[$key]['matchHandicap'] = $match['matchHandicap'] + $handicapChange;
             }
 
 
         // Separate two teams
 
-        foreach($matchUp as $key=>$item){
+        foreach($matchUp as $key=>$item) {
             $teamIds[$key] = $item['team'];
         }
         sort($teamIds);
@@ -99,8 +99,8 @@ 
         $team1 = array();
         $team2 = array();
 
-        foreach($matchUp as $key=>$match){
-            if($match['team'] ==$team1Id ){
+        foreach($matchUp as $key=>$match) {
+            if($match['team'] ==$team1Id ) {
                 $team1[] = $matchUp[$key];
             } else {
                 $team2[] = $matchUp[$key];
@@ -109,8 +109,8 @@ 
 
 
         $team1Name = Team::select('name')->where('id', '=', $team1Id)->get()->toArray();
-        foreach($matchUp as $key=>$match){
-            if($match['team'] == $team1[0]['team']){
+        foreach($matchUp as $key=>$match) {
+            if($match['team'] == $team1[0]['team']) {
                 $team1[] = $match;
                 unset($matchUp[$key]);
             }
@@ -134,16 +134,16 @@ 
             $team1Bonus = null;
             $team2Bonus = null;
 
-            if($team1Scores[8] != null && $team2Scores[8] != null){
-                if($team1Points > $team2Points){
+            if($team1Scores[8] != null && $team2Scores[8] != null) {
+                if($team1Points > $team2Points) {
                     $team1Points = $team1Points + 1;
                     $team1Bonus = 1;
                 }
-                if($team2Points > $team1Points){
+                if($team2Points > $team1Points) {
                     $team2Points = $team2Points + 1;
                     $team2Bonus = 1;
                 }
-                if($team1Points == $team2Points){
+                if($team1Points == $team2Points) {
                     $team1Points = $team1Points + .5;
                     $team1Bonus = .5;
                     $team2Points = $team2Points + .5;
@@ -159,16 +159,16 @@ 
         //Need to determine if same amount of scores are in both
         // If not then do not return
 
-        foreach($team1Scores as $key=>$teamScore){
-            if($teamScore <= 0){
+        foreach($team1Scores as $key=>$teamScore) {
+            if($teamScore <= 0) {
                 $team1Scores[$key] = '';
             }
         }
         $team1Net = array_sum($team1Scores);
 
 
-        foreach($team2Scores as $key=>$teamScore){
-            if($teamScore <= 0){
+        foreach($team2Scores as $key=>$teamScore) {
+            if($teamScore <= 0) {
                 $team2Scores[$key] = '';
             }
         }
@@ -213,11 +213,11 @@ 
 
     private function getTeamNetScore($team, $holesData)
     {
-        foreach($team as $key=>$item){
+        foreach($team as $key=>$item) {
             // Create holes array for NET
             $holes = array();
             $i = 1;
-            foreach($holesData as $key=>$holeData){
+            foreach($holesData as $key=>$holeData) {
                 $holes[$i] = $holeData->handicap;
                 $i++;
             }
@@ -235,8 +235,8 @@ 
                 9 => 0
             ];
             //Create array of strokes
-            for($counter = $item['matchHandicap']; $counter > 0; $counter--){
-                if($counter > 9){
+            for($counter = $item['matchHandicap']; $counter > 0; $counter--) {
+                if($counter > 9) {
                     $newCounter = $counter - 9;
                     while($newCounter > 0) {
                         $strokeArray[$newCounter] = $strokeArray[$newCounter] + 1;
@@ -249,7 +249,7 @@ 
             // Plus handicaps don't hit previous loop so need its own
             //Plus handicap logic
 
-            foreach($strokeArray as $strokeKey=>$stroke){
+            foreach($strokeArray as $strokeKey=>$stroke) {
                 $holeKey = array_search($strokeKey,$holes);
                 $holes[$holeKey] = $stroke;
             }
@@ -258,19 +258,21 @@ 
             //get array of holescores
 
             $holeScores = $item['holescores'];
-            foreach($holeScores as $key=>$holeScore){
+            foreach($holeScores as $key=>$holeScore) {
                 //check if new score is less PlayerScores
-                if(isset($teamScores[$key])){ // 2nd time in for hole
+                if(isset($teamScores[$key])) {
+// 2nd time in for hole
 
                     //set temp handi score
                     $tempScore = $holeScore['score'] - $holes[$key+1];
-                    if($teamScores[$key] >= $tempScore){
+                    if($teamScores[$key] >= $tempScore) {
                         $teamScores[$key] = $holeScore['score'] - $holes[$key+1];
                     }
-                } else{ // first time in for hole
-                    if($holeScore['score'] != null){
+                } else {
+// first time in for hole
+                    if($holeScore['score'] != null) {
                         $teamScores[$key] = $holeScore['score'] - $holes[$key+1];
-                    } else{
+                    } else {
                         $teamScores[$key] = null;
                     }
                 }
@@ -285,12 +287,12 @@ 
         $points = 0;
         $teamTotalPoints = 0;
         $opponentTotalPoints = 0;
-        foreach ($team as $key=>$score){
-            if($score != null){
-                if($score < $opponent[$key]){
+        foreach ($team as $key=>$score) {
+            if($score != null) {
+                if($score < $opponent[$key]) {
                     $points++;
                 }
-                if($score == $opponent[$key]){
+                if($score == $opponent[$key]) {
                     $points = $points + .5;
                 }
             }
@@ -336,9 +338,9 @@ 
 	}
 
 	public function getPointsByYear($year)
-    {
+	{
         $teamMatches = Teammatch::select('team_id','pointsWon')->whereYear('created_at', '=', $year)->with('team')->get();
-        foreach($teamMatches as $key=>$teamMatch){
+        foreach($teamMatches as $key=>$teamMatch) {
             $pointsData[$key]['name'] = $teamMatch['team']['name'];
             $pointsData[$key]['points'] =  Teammatch::select('team_id','pointsWon')
                 ->where('team_id', '=', $teamMatch->team_id)