Created a more fluid avatar system

CapgeminiNorway · Oct 1, 2018 · ac173e5 · ac173e5
1 parent 2947a0f
commit ac173e5
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 16 deletions.
diff --git a/AzureFunctions/FirebaseAuthenticate/.vs/FirebaseAuthenticate/v15/.suo b/AzureFunctions/FirebaseAuthenticate/.vs/FirebaseAuthenticate/v15/.suo
diff --git a/...unctions/FirebaseAuthenticate/.vs/FirebaseAuthenticate/v15/Server/sqlite3/storage.ide-shm b/...unctions/FirebaseAuthenticate/.vs/FirebaseAuthenticate/v15/Server/sqlite3/storage.ide-shm
diff --git a/...unctions/FirebaseAuthenticate/.vs/FirebaseAuthenticate/v15/Server/sqlite3/storage.ide-wal b/...unctions/FirebaseAuthenticate/.vs/FirebaseAuthenticate/v15/Server/sqlite3/storage.ide-wal
diff --git a/AzureFunctions/FirebaseAuthenticate/FirebaseAuthenticate/getCurrentMatch.cs b/AzureFunctions/FirebaseAuthenticate/FirebaseAuthenticate/getCurrentMatch.cs
@@ -50,7 +50,7 @@ public static async Task<HttpResponseMessage> Run([HttpTrigger(AuthorizationLeve
             {
                 string sqlMatches = "SELECT COUNT(DISTINCT matchID) FROM matchList WHERE PID1 = '" + PID + "' OR PID2 = '" + PID + "';";
                 string sqlWins = "SELECT COUNT(DISTINCT matchID) FROM results WHERE win = 1 AND PID = '" + PID + "' GROUP BY PID;";
-                string sqlName = "SELECT username FROM profile WHERE PID = '" + PID + "';";
+                string sqlName = "SELECT username, avatar FROM profile WHERE PID = '" + PID + "';";
 
                 EntryName pidRow = new EntryName();
                 pidRow.label = "username";
@@ -107,7 +107,13 @@ public static async Task<HttpResponseMessage> Run([HttpTrigger(AuthorizationLeve
                                     row.label = "username";
                                     row.name = reader.GetString(0);
                                     result.Add(row);
-                                }
+
+                                    EntryName rowA = new EntryName();
+                                    rowA.label = "avatar";
+                                    rowA.name = reader.GetString(1);
+                                    result.Add(rowA);
+
+                            }
                             }
                         }
                     }

diff --git a/AzureFunctions/FirebaseAuthenticate/FirebaseAuthenticate/getUpcomingMatchInfo.cs b/AzureFunctions/FirebaseAuthenticate/FirebaseAuthenticate/getUpcomingMatchInfo.cs
@@ -62,7 +62,7 @@ public static async Task<HttpResponseMessage> Run([HttpTrigger(AuthorizationLeve
             {
                 string sqlMatches = "SELECT COUNT(DISTINCT matchID) FROM matchList WHERE PID1 = '" + PID + "' OR PID2 = '" + PID + "';";
                 string sqlWins = "SELECT COUNT(DISTINCT matchID) FROM results WHERE win = 1 AND PID = '" + PID + " ' GROUP BY PID;";
-                string sqlName = "SELECT username FROM profile WHERE PID = '" + PID + "';";
+                string sqlName = "SELECT username, avatar FROM profile WHERE PID = '" + PID + "';";
 
                 EntryName pidRow = new EntryName();
                 pidRow.label = "username";
@@ -131,6 +131,10 @@ public static async Task<HttpResponseMessage> Run([HttpTrigger(AuthorizationLeve
                                     row.label = "username";
                                     row.name = reader.GetString(0);
                                     result.Add(row);
+                                    EntryName rowA = new EntryName();
+                                    rowA.label = "avatar";
+                                    rowA.name = reader.GetString(1);
+                                    result.Add(rowA);
                                 }
                             }
                         }

diff --git a/rocket_league_ai_frontend/assets/js/js.js b/rocket_league_ai_frontend/assets/js/js.js
@@ -186,20 +186,21 @@ function getUpcomingMatchInfo(increment) {
 
 
         //P1
-        $("#uindexP1Avatar").attr("src", "https://rlaitimagesandcode.blob.core.windows.net/rlait/avatar_" + data[0].name + ".jpg");
+        $("#uindexP1Avatar").attr("src", "https://rlaitimagesandcode.blob.core.windows.net/rlait/" + data[4].name);
 
         $("#uindexPlayer1TotalMatches").html(parseInt(data[1].count));
         $("#uindexPlayer1TotalWins").html(parseInt(data[2].count));
         $("#uindexPlayer1WinningPercentage").html((parseInt(data[1].count) == 0 ? 0 : (parseInt(data[2].count) / parseInt(data[1].count))).toFixed(2));
 
         //P2
-        $("#uindexP2Avatar").attr("src", "https://rlaitimagesandcode.blob.core.windows.net/rlait/avatar_" + data[4].name + ".jpg");
-        $("#uindexPlayer2TotalMatches").html(parseInt(data[5].count));
-        $("#uindexPlayer2TotalWins").html(parseInt(data[6].count));
-        $("#uindexPlayer2WinningPercentage").html((parseInt(data[5].count) == 0 ? 0 : (parseInt(data[6].count) / parseInt(data[5].count))).toFixed(2));
+        $("#uindexP2Avatar").attr("src", "https://rlaitimagesandcode.blob.core.windows.net/rlait/" + data[9].name);
+        $("#uindexPlayer2TotalMatches").html(parseInt(data[6].count));
+        $("#uindexPlayer2TotalWins").html(parseInt(data[7].count));
+        $("#uindexPlayer2WinningPercentage").html((parseInt(data[6].count) == 0 ? 0 : (parseInt(data[7].count) / parseInt(data[6].count))).toFixed(2));
 
         //Names
-        $("#ucurrentMatchNames").html(data[3].name + " VS " + data[7].name);
+        $("#ucurrentMatchNames").html(data[3].name + " VS " + data[8].name);
+        $("#gameInfoModal").modal("show")
     });
-    $("#gameInfoModal").modal("show");
+   ;
 }
diff --git a/rocket_league_ai_frontend/index.html b/rocket_league_ai_frontend/index.html
@@ -36,20 +36,20 @@
     $.getJSON("https://rlaitfunctions.azurewebsites.net/api/getCurrentMatch", function(data) {
         data = JSON.parse(data);
         //P1
-        $("#p1Avatar").attr("src", "https://rlaitimagesandcode.blob.core.windows.net/rlait/avatar_" + data[0].name + ".jpg");
+        $("#p1Avatar").attr("src", "https://rlaitimagesandcode.blob.core.windows.net/rlait/" + data[4].name);
 
         $("#indexPlayer1TotalMatches").html(parseInt(data[1].count));
         $("#indexPlayer1TotalWins").html(parseInt(data[2].count));
         $("#indexPlayer1WinningPercentage").html((parseInt(data[1].count) == 0 ? 0 : (parseInt(data[2].count) / parseInt(data[1].count))).toFixed(2));
 
         //P2
-        $("#p2Avatar").attr("src", "https://rlaitimagesandcode.blob.core.windows.net/rlait/avatar_" + data[4].name + ".jpg");
-        $("#indexPlayer2TotalMatches").html(parseInt(data[5].count));
-        $("#indexPlayer2TotalWins").html(parseInt(data[6].count));
-        $("#indexPlayer2WinningPercentage").html((parseInt(data[5].count) == 0 ? 0 : (parseInt(data[6].count) / parseInt(data[5].count))).toFixed(2));
+        $("#p2Avatar").attr("src", "https://rlaitimagesandcode.blob.core.windows.net/rlait/" + data[9].name);
+        $("#indexPlayer2TotalMatches").html(parseInt(data[6].count));
+        $("#indexPlayer2TotalWins").html(parseInt(data[7].count));
+        $("#indexPlayer2WinningPercentage").html((parseInt(data[6].count) == 0 ? 0 : (parseInt(data[7].count) / parseInt(data[6].count))).toFixed(2));
 
         //Names
-        $("#currentMatchNames").html(data[3].name + " VS " + data[7].name);
+        $("#currentMatchNames").html(data[3].name + " VS " + data[8].name);
 
         $("#currentMatch").show();