Get league info

OddsJavaFx/src/web/matchTable.php

@@ -10,6 +10,6 @@ $leagueId = $_POST['leagueSelector'];
 
 echo "Country id: " . $countryId . " leagueId: " . $leagueId;
 
-$conn->get
+$conn->getMatches($countryId, $leagueId);
 
 ?>

OddsJavaFx/src/web/webDbConnection.php

@@ -64,58 +64,27 @@ class WebDbConnection {
         "WHERE " .
         "DATE(gameDate) >= DATE(NOW()) " .
         "AND res.leagueId = " . $leagueId .
-        "AND res.countryId = " . $coutryId .
-        "ORDER BY prio DESC, gameDate ASC";
+        " AND res.countryId = " . $countryId .
+        " ORDER BY gameDate ASC";
         
         
         $result = $this->getSqlAsArray($sql);
 
-        return $this->prepareMatches($result);
+        return $this->prepareMatches($result, $leagueId, $countryId);
     }
     
-    private function prepareMatches($matches) {
+    private function prepareMatches($matches, $leagueId, $countryId) {
         foreach ($matches as $match) {
 
             var_dump($match);
-            die();
-        }
-        /*
-        for (final SoccerMatch soccerMatch : upcomingMatches) {
-            
-            
-            final Map<String, Object> match = new HashMap<>();
-            match.put("homeTeam", soccerMatch.getHomeTeam().getTeamName());
-            match.put("awayTeam", soccerMatch.getAwayTeam().getTeamName());
-            match.put("odds1", soccerMatch.getOdds1());
-            match.put("oddsX", soccerMatch.getOddsX());
-            match.put("odds2", soccerMatch.getOdds2());
             
-            final ArrayList<Float> avgHomeTeamGoals = calculateAvgHomeScore(soccerMatch.getHomeTeam().getTeamId());
-            final ArrayList<Float> avgAwayTeamGoals = calculateAvgAwayScore(soccerMatch.getAwayTeam().getTeamId());
-            
-            match.put("gameDate", soccerMatch.getGameDate().toString());
-            match.put("avgScoreHome", avgHomeTeamGoals.get(0));
-            match.put("avgConcededHome", avgHomeTeamGoals.get(1));
-            match.put("avgScoreAway", avgAwayTeamGoals.get(0));
-            match.put("avgConcededAway", avgAwayTeamGoals.get(1));
-            match.put("goalsHome",
-                GuiMysql.getInstance().round(new BigDecimal(avgHomeTeamGoals.get(0) + avgAwayTeamGoals.get(1)),
-                    GuiMysql.getInstance().getIncrement(), RoundingMode.HALF_UP));
-            match.put("goalsAway",
-                GuiMysql.getInstance().round(new BigDecimal(avgAwayTeamGoals.get(0) + avgHomeTeamGoals.get(1)),
-                    GuiMysql.getInstance().getIncrement(), RoundingMode.HALF_UP));
-            match.put("goalDiff",
-                GuiMysql.getInstance()
-                .round(new BigDecimal((avgHomeTeamGoals.get(0) + avgAwayTeamGoals.get(1))
-                    - (avgAwayTeamGoals.get(0) + avgHomeTeamGoals.get(1))),
-                    GuiMysql.getInstance().getIncrement(), RoundingMode.HALF_UP));
-            match.put("country", soccerMatch.getHomeTeam().getCountryName());
-            match.put("league", soccerMatch.getHomeTeam().getTeamLeague());
-            
-            final DecimalFormat df = new DecimalFormat("#.##");
-            df.setRoundingMode(RoundingMode.CEILING);
+            $league = $this->getLeagueInfo($leagueId);
+
+            echo "</br></br> League </br>";
+            var_dump($league);
             
-            final League leagueInfo = GuiMysql.getInstance().getLeagueInfo(soccerMatch.getHomeTeam().getTeamLeague());
+            die();
+/*            
             
             final int lookBack;
             if (leagueInfo.getLookback() != 0) {
@@ -152,7 +121,15 @@ class WebDbConnection {
         
         originalMatches = matches;
         matchTable.getItems().addAll(matches);
-    */
+        */
+        }
+        
+    }
+    
+    private function getLeagueInfo($leagueId) {
+        $sql = "SELECT * FROM League WHERE id = " . $leagueId;
+        $result = $this->getSqlAsArray($sql);
         
+        return $result;
     }
 }