diff --git a/back/back.py b/back/back.py index aa51bbc2..1481e882 100644 --- a/back/back.py +++ b/back/back.py @@ -34,6 +34,7 @@ async def handle_command(message): global cursor global log argument = "" + logtxt = str(message) if type == "connect": log = open("../log.txt", 'a', encoding='utf-8') argument = type @@ -176,6 +177,7 @@ async def handle_command(message): results = fetch_seasonResults(message["year"]) results.insert(0, fetch_events_from(message["year"])) results.insert(0, "Results fetched") + results.append(fetch_teamsStadings(message["year"])) data_json_results = json.dumps(results) #argument = json.dumps(message) await send_message_to_client(data_json_results) @@ -262,7 +264,7 @@ async def handle_command(message): info_json = json.dumps(info) await send_message_to_client(info_json) - log.write("[" + str(datetime.now()) + "] INFO: Command executed: " + argument + "\n") + log.write("[" + str(datetime.now()) + "] INFO: Command executed: " + logtxt + "\n") log.flush() @@ -313,6 +315,10 @@ def fetch_driverNumebrs(): numList.append(num[0]) return numList +def fetch_teamsStadings(year): + res = cursor.execute("SELECT TeamID, Position FROM Races_TeamStandings WHERE SeasonID = " + str(year) + " AND RaceFormula = 1").fetchall() + return res + def fetch_driverRetirement(driverID): day_season = cursor.execute("SELECT Day, CurrentSeason FROM Player_State").fetchone() retirement_age = cursor.execute("SELECT RetirementAge FROM Staff_GameData WHERE StaffID = " + str(driverID)).fetchone() @@ -359,8 +365,7 @@ def fetch_driverContract(id): return details def fetch_staff(): - staff = cursor.execute("SELECT DISTINCT bas.FirstName, bas.LastName, bas.StaffID, con.TeamID, gam.StaffType FROM Staff_GameData gam JOIN Staff_BasicData bas ON gam.StaffID = bas.StaffID LEFT JOIN Staff_Contracts con ON bas.StaffiD = con.StaffID WHERE gam.StaffType != 0 AND (con.ContractType = 0 OR con.ContractType IS NULL OR con.ContractType = 3) GROUP BY bas.StaffID").fetchall() - + staff = cursor.execute("SELECT DISTINCT bas.FirstName, bas.LastName, bas.StaffID, con.TeamID, gam.StaffType FROM Staff_GameData gam JOIN Staff_BasicData bas ON gam.StaffID = bas.StaffID LEFT JOIN Staff_Contracts con ON bas.StaffiD = con.StaffID WHERE gam.StaffType != 0 AND (con.ContractType = 0 OR con.ContractType IS NULL OR con.ContractType = 3) GROUP BY bas.StaffID ORDER BY CASE WHEN con.TeamID IS NULL THEN 1 ELSE 0 END, con.TeamID").fetchall() formatted_tuples = [] for tupla in staff: @@ -480,7 +485,7 @@ def format_seasonResults(results, driverName, teamID, driverID, year, sprints): return formatred_results def fetch_drivers_per_year(year): - drivers = cursor.execute('SELECT bas.FirstName, bas.LastName, res.DriverID, res.TeamID FROM Staff_BasicData bas JOIN Races_Results res ON bas.StaffID = res.DriverID WHERE Season = ' + str(year) + " GROUP BY bas.FirstName, bas.LastName, bas.StaffID, res.TeamID").fetchall() + drivers = cursor.execute('SELECT bas.FirstName, bas.LastName, res.DriverID, res.TeamID FROM Staff_BasicData bas JOIN Races_Results res ON bas.StaffID = res.DriverID WHERE Season = ' + str(year) + " GROUP BY bas.FirstName, bas.LastName, bas.StaffID, res.TeamID ORDER BY res.TeamID").fetchall() formatted_tuples = [] for tupla in drivers: result = format_names_simple(tupla) @@ -489,7 +494,7 @@ def fetch_drivers_per_year(year): def fetch_info(): - drivers = cursor.execute('SELECT DISTINCT bas.FirstName, bas.LastName, bas.StaffID, con.TeamID, con.PosInTeam, MIN(con.ContractType) AS MinContractType, gam.Retired FROM Staff_BasicData bas JOIN Staff_DriverData dri ON bas.StaffID = dri.StaffID LEFT JOIN Staff_Contracts con ON dri.StaffID = con.StaffID LEFT JOIN Staff_GameData gam ON dri.StaffID = gam.StaffID GROUP BY bas.StaffID;').fetchall() + drivers = cursor.execute('SELECT DISTINCT bas.FirstName, bas.LastName, bas.StaffID, con.TeamID, con.PosInTeam, MIN(con.ContractType) AS MinContractType, gam.Retired FROM Staff_BasicData bas JOIN Staff_DriverData dri ON bas.StaffID = dri.StaffID LEFT JOIN Staff_Contracts con ON dri.StaffID = con.StaffID LEFT JOIN Staff_GameData gam ON dri.StaffID = gam.StaffID GROUP BY bas.StaffID ORDER BY CASE WHEN con.TeamID IS NULL THEN 1 ELSE 0 END, con.TeamID;').fetchall() formatted_tuples = [] for tupla in drivers: result = format_names_get_stats(tupla, "driver") diff --git a/back/scripts/head2head_23.py b/back/scripts/head2head_23.py index c37a7065..f2569446 100644 --- a/back/scripts/head2head_23.py +++ b/back/scripts/head2head_23.py @@ -1,4 +1,5 @@ import sqlite3 +import numpy as np def fetch_Head2Head(driver1ID, driver2ID, year): conn = sqlite3.connect("../result/main.db") cursor = conn.cursor() @@ -20,6 +21,14 @@ def fetch_Head2Head(driver1ID, driver2ID, year): d2_BestRace = 21 d1_BestQauli = 21 d2_BestQauli = 21 + d1_avgPace = [] + d2_avgPace = [] + d1_avgQPace = [] + d2_avgQPace = [] + d1_RPositions = [] + d2_RPositions = [] + d1_QPositions = [] + d2_QPositions = [] for race in tuple_races: d1_QStage = cursor.execute("SELECT MAX(QualifyingStage) FROM Races_QualifyingResults WHERE RaceFormula = 1 AND RaceID =" + str(race) + " AND SeasonID = " + str(year[0]) + " AND DriverID = " + str(driver1ID[0])).fetchone() d2_QStage = cursor.execute("SELECT MAX(QualifyingStage) FROM Races_QualifyingResults WHERE RaceFormula = 1 AND RaceID =" + str(race) + " AND SeasonID = " + str(year[0]) + " AND DriverID = " + str(driver2ID[0])).fetchone() @@ -34,6 +43,14 @@ def fetch_Head2Head(driver1ID, driver2ID, year): qualiH2H[0]+= 1 elif(d1_QRes[0] > d2_QRes[0]): qualiH2H[1]+= 1 + d1_QPositions.append(d1_QRes[0]) + d2_QPositions.append(d2_QRes[0]) + minQ = d1_QStage[0] if d1_QStage[0] <= d2_QStage[0] else d2_QStage[0] + d1_qLap = cursor.execute("SELECT FastestLap FROM Races_QualifyingResults WHERE RaceFormula = 1 AND RaceID =" + str(race) + " AND SeasonID = " + str(year[0]) + " AND DriverID = " + str(driver1ID[0]) + " AND QualifyingStage = " + str(minQ)).fetchone() + d2_qLap = cursor.execute("SELECT FastestLap FROM Races_QualifyingResults WHERE RaceFormula = 1 AND RaceID =" + str(race) + " AND SeasonID = " + str(year[0]) + " AND DriverID = " + str(driver2ID[0]) + " AND QualifyingStage = " + str(minQ)).fetchone() + if(d1_qLap[0] != 0) and (d2_qLap[0] != 0): + d1_avgQPace.append(d1_qLap[0]) + d2_avgQPace.append(d2_qLap[0]) if(d1_QStage[0] == 3 and d1_QRes[0] == 1): polesH2H[0] += 1 if(d2_QStage[0] == 3 and d2_QRes[0] == 1): @@ -60,12 +77,21 @@ def fetch_Head2Head(driver1ID, driver2ID, year): d1_BestRace = d1_RRes[0] if(d2_RRes[0] < d2_BestRace): d2_BestRace = d2_RRes[0] + d1_RPositions.append(d1_RRes[0]) + d2_RPositions.append(d2_RRes[0]) d1_RDNF = cursor.execute("SELECT DNF FROM Races_Results WHERE RaceID =" + str(race) + " AND Season = " + str(year[0]) + " AND DriverID = " + str(driver1ID[0])).fetchone() d2_RDNF = cursor.execute("SELECT DNF FROM Races_Results WHERE RaceID =" + str(race) + " AND Season = " + str(year[0]) + " AND DriverID = " + str(driver2ID[0])).fetchone() if(d1_RDNF[0] == 1): dnfH2H[0] += 1 if(d2_RDNF[0] == 1): dnfH2H[1] += 1 + if (d1_RDNF[0] != 1) and (d2_RDNF[0] != 1): + d1_raceTotal = cursor.execute("SELECT Time FROM Races_Results WHERE RaceID =" + str(race) + " AND Season = " + str(year[0]) + " AND DriverID = " + str(driver1ID[0])).fetchone() + d2_raceTotal = cursor.execute("SELECT Time FROM Races_Results WHERE RaceID =" + str(race) + " AND Season = " + str(year[0]) + " AND DriverID = " + str(driver2ID[0])).fetchone() + d1_raceLaps = cursor.execute("SELECT Laps FROM Races_Results WHERE RaceID =" + str(race) + " AND Season = " + str(year[0]) + " AND DriverID = " + str(driver1ID[0])).fetchone() + d2_raceLaps = cursor.execute("SELECT Laps FROM Races_Results WHERE RaceID =" + str(race) + " AND Season = " + str(year[0]) + " AND DriverID = " + str(driver2ID[0])).fetchone() + d1_avgPace.append(round(d1_raceTotal[0] / d1_raceLaps[0], 3)) + d2_avgPace.append(round(d2_raceTotal[0] / d2_raceLaps[0], 3)) d1_SRes = cursor.execute("SELECT FinishingPos FROM Races_Sprintresults WHERE RaceID =" + str(race) + " AND SeasonID = " + str(year[0]) + " AND DriverID = " + str(driver1ID[0])).fetchone() d2_SRes = cursor.execute("SELECT FinishingPos FROM Races_Sprintresults WHERE RaceID =" + str(race) + " AND SeasonID = " + str(year[0]) + " AND DriverID = " + str(driver2ID[0])).fetchone() if(d1_SRes != None): @@ -74,7 +100,6 @@ def fetch_Head2Head(driver1ID, driver2ID, year): if(d2_SRes != None): if(d2_SRes[0] == 1): sprintWinsH2H[1] += 1 - d1_Pts = cursor.execute("SELECT Points FROM Races_DriverStandings WHERE RaceFormula = 1 AND SeasonID = " + str(year[0]) + " AND DriverID = " + str(driver1ID[0])).fetchone() d2_Pts = cursor.execute("SELECT Points FROM Races_DriverStandings WHERE RaceFormula = 1 AND SeasonID = " + str(year[0]) + " AND DriverID = " + str(driver2ID[0])).fetchone() pointsH2H[0] = d1_Pts[0] @@ -82,8 +107,20 @@ def fetch_Head2Head(driver1ID, driver2ID, year): bestRace[0] = d1_BestRace bestRace[1] = d2_BestRace bestQuali[0] = d1_BestQauli - bestQuali[1] = d2_BestQauli - resultList = [tuple(raceH2H),tuple(qualiH2H),tuple(pointsH2H),tuple(podiumsH2H),tuple(bestRace),tuple(bestQuali),tuple(dnfH2H), tuple(winsH2H), tuple(polesH2H), tuple(sprintWinsH2H)] + bestQuali[1] = d2_BestQauli + rDifferences = [d2 - d1 for d1, d2 in zip(d1_avgPace, d2_avgPace)] + qDifferences = [d2 - d1 for d1, d2 in zip(d1_avgQPace, d2_avgQPace)] + avg_racediff = round(np.mean(rDifferences), 3) + avg_qualidiff = round(np.mean(qDifferences), 3) + meanRd1 = round(np.mean(d1_RPositions), 1) + meanRd2 = round(np.mean(d2_RPositions), 1) + medianRd1 = np.median(d1_RPositions) + medianRd2 = np.median(d2_RPositions) + meanQd1 = round(np.mean(d1_QPositions), 1) + meanQd2 = round(np.mean(d2_QPositions), 1) + medianQd1 = np.median(d1_QPositions) + medianQd2 = np.median(d2_QPositions) + resultList = [tuple(raceH2H),tuple(qualiH2H),tuple(pointsH2H),tuple(podiumsH2H),tuple(bestRace),tuple(bestQuali),tuple(dnfH2H), tuple(winsH2H), tuple(polesH2H), tuple(sprintWinsH2H), (-avg_racediff, avg_racediff), (-avg_qualidiff, avg_qualidiff), (meanRd1, meanRd2), (medianRd1, medianRd2), (meanQd1, meanQd2), (medianQd1, medianQd2)] conn.commit() conn.close() @@ -109,6 +146,10 @@ def fetch_Head2Head_team(teamID1, teamID2, year): d2_BestRace = 21 d1_BestQauli = 21 d2_BestQauli = 21 + d1_avgPace = [] + d2_avgPace = [] + d1_avgQPace = [] + d2_avgQPace = [] for gp in races: race = gp[0] drivers1 = cursor.execute("SELECT DISTINCT DriverID FROM Races_QualifyingResults WHERE RaceFormula = 1 AND RaceID = " + str(race) + " AND TeamID = " + str(teamID1[0])).fetchall() @@ -128,6 +169,12 @@ def fetch_Head2Head_team(teamID1, teamID2, year): qualiH2H[0]+= 1 elif(d1_QRes[0] > d2_QRes[0]): qualiH2H[1]+= 1 + minQ = d1_QStage[0] if d1_QStage[0] <= d2_QStage[0] else d2_QStage[0] + d1_qLap = cursor.execute("SELECT FastestLap FROM Races_QualifyingResults WHERE RaceFormula = 1 AND RaceID =" + str(race) + " AND SeasonID = " + str(year[0]) + " AND DriverID IN " + str(drivers1) + " AND QualifyingStage = " + str(minQ)).fetchone() + d2_qLap = cursor.execute("SELECT FastestLap FROM Races_QualifyingResults WHERE RaceFormula = 1 AND RaceID =" + str(race) + " AND SeasonID = " + str(year[0]) + " AND DriverID IN " + str(drivers2) + " AND QualifyingStage = " + str(minQ)).fetchone() + if(d1_qLap[0] != 0) and (d2_qLap[0] != 0): + d1_avgQPace.append(d1_qLap[0]) + d2_avgQPace.append(d2_qLap[0]) if(d1_QStage[0] == 3 and d1_QRes[0] == 1): polesH2H[0] += 1 if(d2_QStage[0] == 3 and d2_QRes[0] == 1): @@ -160,6 +207,13 @@ def fetch_Head2Head_team(teamID1, teamID2, year): dnfH2H[0] += d1_RDNF[0] if(d2_RDNF[0] > 0): dnfH2H[1] += d2_RDNF[0] + if (d1_RDNF[0] == 0) and (d2_RDNF[0] == 0): + d1_raceTotal = cursor.execute("SELECT AVG(Time) FROM Races_Results WHERE RaceID =" + str(race) + " AND Season = " + str(year[0]) + " AND DriverID IN " + str(drivers1)).fetchone() + d2_raceTotal = cursor.execute("SELECT AVG(Time) FROM Races_Results WHERE RaceID =" + str(race) + " AND Season = " + str(year[0]) + " AND DriverID IN " + str(drivers2)).fetchone() + d1_raceLaps = cursor.execute("SELECT AVG(Laps) FROM Races_Results WHERE RaceID =" + str(race) + " AND Season = " + str(year[0]) + " AND DriverID IN " + str(drivers1)).fetchone() + d2_raceLaps = cursor.execute("SELECT AVG(Laps) FROM Races_Results WHERE RaceID =" + str(race) + " AND Season = " + str(year[0]) + " AND DriverID IN " + str(drivers2)).fetchone() + d1_avgPace.append(round(d1_raceTotal[0] / d1_raceLaps[0], 3)) + d2_avgPace.append(round(d2_raceTotal[0] / d2_raceLaps[0], 3)) d1_SRes = cursor.execute("SELECT MIN(FinishingPos) FROM Races_Sprintresults WHERE RaceID =" + str(race) + " AND SeasonID = " + str(year[0]) + " AND DriverID IN " + str(drivers1)).fetchone() d2_SRes = cursor.execute("SELECT MIN(FinishingPos) FROM Races_Sprintresults WHERE RaceID =" + str(race) + " AND SeasonID = " + str(year[0]) + " AND DriverID IN " + str(drivers2)).fetchone() if(d1_SRes != None): @@ -177,7 +231,13 @@ def fetch_Head2Head_team(teamID1, teamID2, year): bestRace[1] = d2_BestRace bestQuali[0] = d1_BestQauli bestQuali[1] = d2_BestQauli - resultList = [tuple(raceH2H),tuple(qualiH2H),tuple(pointsH2H),tuple(podiumsH2H),tuple(bestRace),tuple(bestQuali),tuple(dnfH2H), tuple(winsH2H), tuple(polesH2H), tuple(sprintWinsH2H)] + + rDifferences = [d2 - d1 for d1, d2 in zip(d1_avgPace, d2_avgPace)] + qDifferences = [d2 - d1 for d1, d2 in zip(d1_avgQPace, d2_avgQPace)] + avg_racediff = round(np.mean(rDifferences), 3) + avg_qualidiff = round(np.mean(qDifferences), 3) + + resultList = [tuple(raceH2H),tuple(qualiH2H),tuple(pointsH2H),tuple(podiumsH2H),tuple(bestRace),tuple(bestQuali),tuple(dnfH2H), tuple(winsH2H), tuple(polesH2H), tuple(sprintWinsH2H), (-avg_racediff, avg_racediff), (-avg_qualidiff, avg_qualidiff)] conn.commit() conn.close() diff --git a/front/index.html b/front/index.html index 9cc27483..74158610 100644 --- a/front/index.html +++ b/front/index.html @@ -179,10 +179,10 @@

Contracts info

-

Contracts info

+

Performance info

-
+
From the Teams tab, you will be able to edit performance from every part of any team. The number you see beside the bars are the Increment or Decrement in performance for that part in specific. @@ -205,7 +205,7 @@

Contracts info

Forecast info

-
+
The predictions are made with an AI model trained with the developer's own save file. You c an check out predictions for previous races and for the next one in the Race tab.
@@ -224,6 +224,49 @@

Forecast info

+ +
-
+
+
RACE
+
-
+
@@ -696,10 +742,17 @@

by @ig

+
+
+
+
+
+
+
+
+
+
@@ -1449,7 +1507,7 @@

by @ig -
+
MCLAREN
@@ -1459,7 +1517,7 @@

by @ig -
+
MERCEDES
@@ -1489,13 +1547,13 @@

by @ig -
+
ALFA ROMEO
-
+
ASTON MARTIN
@@ -1503,6 +1561,7 @@

by @ig

Team editor + ?
diff --git a/front/js/calendar.js b/front/js/calendar.js index e0498da2..1bded088 100644 --- a/front/js/calendar.js +++ b/front/js/calendar.js @@ -14,7 +14,7 @@ let countries_dict = { }; let weather_dict = { - 0: "bi bi-sun", 1:"bi bi-cloud-sun", 2: "bi bi-cloud", 3: "bi bi-cloud-drizzle", 4: "bi bi-cloud-rain-heavy", 5: "bi bi-cloud-lightning-rain" + 0: "bi bi-sun", 1:"bi bi-cloud-sun", 2: "bi bi-cloud", 3: "bi bi-cloud-drizzle", 4: "bi bi-cloud-rain", 5: "bi bi-cloud-rain-heavy" } let deleting = false; diff --git a/front/js/head2head.js b/front/js/head2head.js index f67651b4..99eaec68 100644 --- a/front/js/head2head.js +++ b/front/js/head2head.js @@ -8,6 +8,9 @@ let d2_team let wins = false; let poles = false; let sprints = false; +let race = 0; +let quali = 0; +let menuLength = 4; let colors_dict = { "10": "#F91536", "11": "#f1f1f1", "20": "#F58020", "21": "#47c7fc", "30": "#3671C6", "31": "#ffd300", "40": "#6CD3BF", "41": "#fcfcfc", "50": "#2293D1", "51": "#fd48c7", "60": "#37BEDD", "61": "#f1f1f1", "70": "#B6BABD", "71": "#f62039", "80": "#5E8FAA", "81": "#f1f1f1", "90": "#C92D4B", "91": "#f1f1f1", "100": "#358C75", "101": "#c3dc00" } let driverGraph; let pointsGraph; @@ -130,21 +133,102 @@ function manage_h2h_bars(data) { } else { if (elem.id === "raceh2h" || elem.id === "qualih2h") { - relValue = (100 / (data[0][0] + data[0][1])).toFixed(2) + + let index2 + if (elem.id === "raceh2h") { + index2 = 10 + } + else { + index2 = 11 + } + let d1Num = elem.querySelector(".avg-comparison").querySelector(".driver1-avg") + d1Num.className = "driver1-avg bold-font" + let d2Num = elem.querySelector(".avg-comparison").querySelector(".driver2-avg") + d2Num.className = "driver2-avg bold-font" + let d1 = compData[index2][0]; + if (compData[index2][0] > 0) { + d1 = "+" + compData[index2][0] + d1Num.classList.add("negative") + d2Num.classList.add("positive") + } + d1Num.innerText = d1 + let d2 = compData[index2][1]; + if (compData[index2][1] > 0) { + d2 = "+" + compData[index2][1] + d1Num.classList.add("positive") + d2Num.classList.add("negative") + } + d2Num.innerText = d2 + + if (elem.id === "qualih2h") { + relValue = (100 / (data[0][0] + data[0][1])).toFixed(2) + if (relValue == Infinity) { + relValue = 0 + } + d1_width = data[index][0] * relValue + d2_width = data[index][1] * relValue + elem.querySelector(".driver1-number").textContent = data[index][0] + elem.querySelector(".driver2-number").textContent = data[index][1] + if (quali === 2) { + d1_width = 100 - (data[14][0] - 1) * 5 + d2_width = 100 - (data[14][1] - 1) * 5 + elem.querySelector(".driver1-number").textContent = data[14][0] + elem.querySelector(".driver2-number").textContent = data[14][1] + } + else if (quali === 3) { + d1_width = 100 - (data[15][0] - 1) * 5 + d2_width = 100 - (data[15][1] - 1) * 5 + elem.querySelector(".driver1-number").textContent = data[15][0] + elem.querySelector(".driver2-number").textContent = data[15][1] + } + } + + if (elem.id === "raceh2h") { + relValue = (100 / (data[0][0] + data[0][1])).toFixed(2) + if (relValue == Infinity) { + relValue = 0 + } + d1_width = data[index][0] * relValue + d2_width = data[index][1] * relValue + elem.querySelector(".driver1-number").textContent = data[index][0] + elem.querySelector(".driver2-number").textContent = data[index][1] + + if (race === 2) { + d1_width = 100 - (data[12][0] - 1) * 5 + d2_width = 100 - (data[12][1] - 1) * 5 + elem.querySelector(".driver1-number").textContent = data[12][0] + elem.querySelector(".driver2-number").textContent = data[12][1] + } + else if (race === 3) { + d1_width = 100 - (data[13][0] - 1) * 5 + d2_width = 100 - (data[13][1] - 1) * 5 + elem.querySelector(".driver1-number").textContent = data[13][0] + elem.querySelector(".driver2-number").textContent = data[13][1] + } + } + } else if (elem.id === "ptsh2h") { relValue = 100 / Math.max(data[index][0], data[index][1]) + if (relValue == Infinity) { + relValue = 0 + } + d1_width = data[index][0] * relValue + d2_width = data[index][1] * relValue + elem.querySelector(".driver1-number").textContent = data[index][0] + elem.querySelector(".driver2-number").textContent = data[index][1] } else if (elem.id === "dnfh2h" || elem.id === "podiumsh2h") { relValue = (100 / (data[index][0] + data[index][1])).toFixed(2) + if (relValue == Infinity) { + relValue = 0 + } + d1_width = data[index][0] * relValue + d2_width = data[index][1] * relValue + elem.querySelector(".driver1-number").textContent = data[index][0] + elem.querySelector(".driver2-number").textContent = data[index][1] } - if (relValue == Infinity) { - relValue = 0 - } - d1_width = data[index][0] * relValue - d2_width = data[index][1] * relValue - elem.querySelector(".driver1-number").textContent = data[index][0] - elem.querySelector(".driver2-number").textContent = data[index][1] + } if (d1_width > 100) { d1_width = 100 @@ -224,16 +308,195 @@ function toggle_sprints() { fill_bars(elem, d1_width, d2_width) } +function toggle_racePace() { + let elem = document.querySelector("#raceh2h") + if (race === 1) { + elem.querySelector(".only-name").textContent = "AVG PACE DIFF (s)" + elem.querySelector(".bar-space").classList.add("d-none") + elem.querySelector(".avg-comparison").classList.remove("d-none") + let d1Num = elem.querySelector(".avg-comparison").querySelector(".driver1-avg") + d1Num.className = "driver1-avg bold-font" + let d2Num = elem.querySelector(".avg-comparison").querySelector(".driver2-avg") + d2Num.className = "driver2-avg bold-font" + let d1 = compData[10][0]; + if (compData[10][0] > 0) { + d1 = "+" + compData[10][0] + d1Num.classList.add("negative") + d2Num.classList.add("positive") + } + d1Num.innerText = d1 + let d2 = compData[10][1]; + if (compData[10][1] > 0) { + d2 = "+" + compData[10][1] + d1Num.classList.add("positive") + d2Num.classList.add("negative") + } + d2Num.innerText = d2 + } + else { + elem.querySelector(".bar-space").classList.remove("d-none") + elem.querySelector(".avg-comparison").classList.add("d-none") + if (race === 0) { + elem.querySelector(".only-name").textContent = "RACE" + relValue = (100 / (compData[0][0] + compData[0][1])).toFixed(2) + d1_width = compData[0][0] * relValue + d2_width = compData[0][1] * relValue + elem.querySelector(".driver1-number").textContent = compData[0][0] + elem.querySelector(".driver2-number").textContent = compData[0][1] + } + else if (race === 2) { + elem.querySelector(".only-name").textContent = "AVG RACE" + d1_width = 100 - (compData[12][0] - 1) * 5 + d2_width = 100 - (compData[12][1] - 1) * 5 + elem.querySelector(".driver1-number").textContent = compData[12][0] + elem.querySelector(".driver2-number").textContent = compData[12][1] + } + else if (race === 3) { + elem.querySelector(".only-name").textContent = "MEDIAN RACE" + d1_width = 100 - (compData[13][0] - 1) * 5 + d2_width = 100 - (compData[13][1] - 1) * 5 + elem.querySelector(".driver1-number").textContent = compData[13][0] + elem.querySelector(".driver2-number").textContent = compData[13][1] + } + fill_bars(elem, d1_width, d2_width) + } + +} + +function toggle_qualiPace() { + let elem = document.querySelector("#qualih2h") + if (quali === 1) { + elem.querySelector(".only-name").textContent = "AVG QUALI DIFF (s)" + elem.querySelector(".bar-space").classList.add("d-none") + elem.querySelector(".avg-comparison").classList.remove("d-none") + let d1Num = elem.querySelector(".avg-comparison").querySelector(".driver1-avg") + d1Num.className = "driver1-avg bold-font" + let d2Num = elem.querySelector(".avg-comparison").querySelector(".driver2-avg") + d2Num.className = "driver2-avg bold-font" + let d1 = compData[11][0]; + if (compData[11][0] > 0) { + d1 = "+" + compData[11][0] + + d1Num.classList.add("negative") + d2Num.classList.add("positive") + } + d1Num.innerText = d1 + let d2 = compData[11][1]; + if (compData[11][1] > 0) { + d2 = "+" + compData[11][1] + + d1Num.classList.add("positive") + d2Num.classList.add("negative") + } + d2Num.innerText = d2 + } + else { + elem.querySelector(".bar-space").classList.remove("d-none") + elem.querySelector(".avg-comparison").classList.add("d-none") + if (quali === 0) { + elem.querySelector(".only-name").textContent = "QUALIFYING" + relValue = (100 / (compData[0][0] + compData[0][1])).toFixed(2) + d1_width = compData[1][0] * relValue + d2_width = compData[1][1] * relValue + elem.querySelector(".driver1-number").textContent = compData[1][0] + elem.querySelector(".driver2-number").textContent = compData[1][1] + } + else if (quali === 2) { + elem.querySelector(".only-name").textContent = "AVG QUALI" + d1_width = 100 - (compData[14][0] - 1) * 5 + d2_width = 100 - (compData[14][1] - 1) * 5 + elem.querySelector(".driver1-number").textContent = compData[14][0] + elem.querySelector(".driver2-number").textContent = compData[14][1] + } + else if (quali === 3) { + elem.querySelector(".only-name").textContent = "MEDIAN QUALI" + d1_width = 100 - (compData[15][0] - 1) * 5 + d2_width = 100 - (compData[15][1] - 1) * 5 + elem.querySelector(".driver1-number").textContent = compData[15][0] + elem.querySelector(".driver2-number").textContent = compData[15][1] + } + fill_bars(elem, d1_width, d2_width) + } +} + /** * Adds listeners for the arrows to change between sprints and races */ function sprintsListeners() { document.querySelector("#bestrh2h").querySelectorAll("i").forEach(function (elem) { - elem.removeEventListener('evento', change_sprintView); + elem.removeEventListener('evento2', change_sprintView); elem.addEventListener("click", change_sprintView) }) } +/** + * listeners to the race head to head comparison + */ +function racePaceListener() { + document.querySelector("#raceh2h").querySelectorAll(".bi-chevron-right").forEach(function (elem) { + elem.removeEventListener('evento5', increase_racePaceView); + elem.addEventListener("click", increase_racePaceView) + }) + document.querySelector("#raceh2h").querySelectorAll(".bi-chevron-left").forEach(function (elem) { + elem.removeEventListener('evento6', decrease_racePaceView); + elem.addEventListener("click", decrease_racePaceView) + }) +} + +/** + * listeners to the qualifying head to head comparison + */ +function qualiPaceListener() { + document.querySelector("#qualih2h").querySelectorAll(".bi-chevron-right").forEach(function (elem) { + elem.removeEventListener('evento3', increase_qualiPaceView); + elem.addEventListener("click", increase_qualiPaceView) + }) + document.querySelector("#qualih2h").querySelectorAll(".bi-chevron-left").forEach(function (elem) { + elem.removeEventListener('evento4', decrease_qualiPaceView); + elem.addEventListener("click", decrease_qualiPaceView) + }) +} + + +/** + * increases the race comparison showed + */ +function increase_racePaceView() { + race += 1 + race = race % menuLength + toggle_racePace() +} + +/** + * decreases the race comparison showed + */ +function decrease_racePaceView() { + race -= 1 + race = (race + menuLength) % menuLength + toggle_racePace() +} + +/** + * increases the quali comparison showed + */ +function increase_qualiPaceView() { + quali += 1 + quali = quali % menuLength + toggle_qualiPace() +} + +/** + * decreases the quali comparison showed + */ +function decrease_qualiPaceView() { + quali -= 1 + quali = (quali + menuLength) % menuLength + toggle_qualiPace() +} + + + + /** * Changes the sprint view */ @@ -262,10 +525,13 @@ document.getElementById("annotationsToggle").addEventListener("click", function }) -function hideComp(){ +/** + * hides the comparison + */ +function hideComp() { document.querySelector(".drivers-modal-zone").innerHTML = "" document.querySelector("#mainH2h").classList.add("d-none") - document.querySelectorAll(".modal-team").forEach(function(elem){ + document.querySelectorAll(".modal-team").forEach(function (elem) { elem.classList.add("d-none") }) } @@ -425,6 +691,7 @@ document.querySelector("#driverspillmodal").addEventListener("click", function ( document.querySelector(".drivers-modal-section").classList.remove("d-none") document.querySelector(".teams-modal-section").classList.add("d-none") mode = "driver" + resetH2H() }) @@ -451,7 +718,7 @@ document.querySelector("#confirmComparison").addEventListener("click", function let d1 let d2 document.querySelectorAll(".H2Hradio.activated").forEach(function (elem) { - if(mode === "driver"){ + if (mode === "driver") { if (elem.dataset.driverid === h2hList[0]) { d1 = elem; } @@ -459,7 +726,7 @@ document.querySelector("#confirmComparison").addEventListener("click", function d2 = elem } } - else if(mode === "team"){ + else if (mode === "team") { if (elem.dataset.teamid === h2hTeamList[0]) { d1 = elem; } @@ -473,15 +740,33 @@ document.querySelector("#confirmComparison").addEventListener("click", function nameTitleD2(d2.parentElement.parentElement) } document.querySelector("#compConfigContent").innerText = document.querySelector("#yearButtonH2H").textContent - if(mode === "driver"){ + if (mode === "driver") { document.querySelector("#qualiForm").classList.remove("d-none") document.querySelector("#raceForm").classList.remove("d-none") document.querySelector("#raceForm").click() + race = 0 + quali = 0 + menuLength = 4 + document.getElementById("qualih2h").querySelector(".only-name").innerText = "QUALIFYING" + document.getElementById("raceh2h").querySelector(".only-name").innerText = "RACE" + document.getElementById("raceh2h").querySelector(".bar-space").classList.remove("d-none") + document.getElementById("raceh2h").querySelector(".avg-comparison").classList.add("d-none") + document.getElementById("qualih2h").querySelector(".bar-space").classList.remove("d-none") + document.getElementById("qualih2h").querySelector(".avg-comparison").classList.add("d-none") } - else if(mode === "team"){ + else if (mode === "team") { document.querySelector("#qualiForm").classList.add("d-none") document.querySelector("#raceForm").classList.add("d-none") document.querySelector("#pointsProgression").click() + menuLength = 2 + race = 0 + quali = 0 + document.getElementById("qualih2h").querySelector(".only-name").innerText = "QUALIFYING" + document.getElementById("raceh2h").querySelector(".only-name").innerText = "RACE" + document.getElementById("raceh2h").querySelector(".bar-space").classList.remove("d-none") + document.getElementById("raceh2h").querySelector(".avg-comparison").classList.add("d-none") + document.getElementById("qualih2h").querySelector(".bar-space").classList.remove("d-none") + document.getElementById("qualih2h").querySelector(".avg-comparison").classList.add("d-none") } }) @@ -495,11 +780,11 @@ function resetH2H() { graphTeamList = [] let h2htext = document.querySelector(".H2H-text").querySelector(".text-normal") let graphtext = document.querySelector(".graph-text").querySelector(".text-normal") - if(mode === "driver"){ + if (mode === "driver") { h2htext.innerText = "- " + h2hCount + "/2 drivers selected" graphtext.innerText = "- " + graphCount + " drivers selected" } - else if(mode === "team"){ + else if (mode === "team") { h2htext.innerText = "- " + h2hCount + "/2 teams selected" graphtext.innerText = "- " + graphCount + " teams selected" } diff --git a/front/js/renderer.js b/front/js/renderer.js index 8b813819..cd956615 100644 --- a/front/js/renderer.js +++ b/front/js/renderer.js @@ -157,6 +157,8 @@ document.addEventListener('DOMContentLoaded', function () { }, "H2H fetched": (message) => { sprintsListeners(); + racePaceListener(); + qualiPaceListener() manage_h2h_bars(message.slice(1)[0]); }, "DriversH2H fetched": (message) => { @@ -225,7 +227,7 @@ document.addEventListener('DOMContentLoaded', function () { */ socket.onmessage = (event) => { let message = JSON.parse(event.data); - console.log(message[0]) + console.log(message) let handler = messageHandlers[message[0]]; if (handler) { diff --git a/front/js/seasonViewer.js b/front/js/seasonViewer.js index 34aa208b..01e5693f 100644 --- a/front/js/seasonViewer.js +++ b/front/js/seasonViewer.js @@ -43,7 +43,8 @@ function createDriversTable(calendar) { layout: "fitColumns", maxWidth: "1650px", responsiveLayout: "hide", - columns: [{ title: "Driver", field: "driver", width: 175, headerSort: false, resizable: false, formatter: "html", headerHozAlign: "center" }, + columns: [{ title: "#", field: "pos", hozAlign: "center", headerHozAlign: "center" , width:35, headerSort: false}, + { title: "DRIVER", field: "driver", width: 175, headerSort: false, resizable: false, formatter: "html", headerHozAlign: "left" }, ...calendar.map((race, index) => ({ title: '
Image 1
' + races_names[race[1]] + '
', field: "race" + race[0], @@ -51,9 +52,8 @@ function createDriversTable(calendar) { headerSort: false, resizable: false })), - { title: "Points", field: "points", hozAlign: "center", headerSort: false, headerHozAlign: "center", resizable: false }, - { title: "Position", field: "pos", hozAlign: "center", visible: false } - + { title: "POINTS", width: 75, field: "points", hozAlign: "center", headerSort: false, headerHozAlign: "center", resizable: false } + ], rowFormatter: function (row) { var rowData = row.getData(); @@ -156,7 +156,8 @@ function createTeamsTable(calendar) { maxWidth: "1650px", rowHeight: 60, responsiveLayout: "hide", - columns: [{ title: "Team", field: "team", width: 195, headerSort: false, vertAlign: "middle", resizable: false, formatter: "html", headerHozAlign: "center" }, + columns: [{ title: "#", field: "pos", hozAlign: "center", headerHozAlign: "center", headerSort: false, resizable: false, width:35, vertAlign: "middle"}, + { title: "TEAM", field: "team", width: 195, headerSort: false, vertAlign: "middle", resizable: false, formatter: "html", headerHozAlign: "center" }, ...calendar.map((race, index) => ({ title: '
Image 1
' + races_names[race[1]] + '
', field: "race" + race[0], @@ -166,8 +167,8 @@ function createTeamsTable(calendar) { headerSort: false, resizable: false })), - { title: "Points", field: "points", hozAlign: "center", vertAlign: "middle", headerSort: false, headerHozAlign: "center", resizable: false }, - { title: "Position", field: "pos", hozAlign: "center", visible: false }], + { title: "POINTS", width: 75, field: "points", hozAlign: "center", vertAlign: "middle", headerSort: false, headerHozAlign: "center", resizable: false } + ], }); } @@ -305,7 +306,6 @@ document.getElementById("teamspill").addEventListener("click", function () { * Even listener for the positions and points pill */ document.getElementById("pospill").addEventListener("click", function () { - document.getElementById("driverspill").click() if (seasonTable) { seasonTable.destroy() } @@ -324,7 +324,6 @@ document.getElementById("pospill").addEventListener("click", function () { }) document.getElementById("pointspill").addEventListener("click", function () { - document.getElementById("driverspill").click() if (seasonTable) { seasonTable.destroy() } @@ -423,7 +422,7 @@ function generateYearsMenu(actualYear) { */ function loadDriversTable(allDrivers) { seasonResults = allDrivers; - allDrivers.forEach(function (driver) { + allDrivers.slice(0, allDrivers.length-1).forEach(function (driver) { addDriver(driver) }) seasonTable.setSort("pos", "asc"); @@ -437,15 +436,22 @@ function loadDriversTable(allDrivers) { * @param {object} allDrivers information for all the drivers on the grid */ function loadTeamsTable(allDrivers) { + let teamStandings = allDrivers[allDrivers.length-1] + let positions = {}; + for(let i = 0; i < teamStandings.length; i++) { + positions[teamStandings[i][0]] = teamStandings[i][1]; + } for (let team in teams_full_name_dict) { - let rowData = { team: createTeamNameAndLogo(teams_full_name_dict[team], team), points: 0} - teamsTable.addData(rowData) + let pos = positions[teams_full_name_dict[team]] + let rowData = { team: createTeamNameAndLogo(teams_full_name_dict[team], team), points: 0, pos: pos} + teamsTable.addData(rowData); } + console.log(allDrivers) setTimeout(function () { addDriversDataToTeams(allDrivers) colorTeamTable() }, 10); - teamsTable.setSort("points", "desc"); + teamsTable.setSort("pos", "asc"); document.querySelector("#seasonresults-teams-table").querySelector(".tabulator-tableholder").style.maxHeight = "598px"; document.querySelector("#seasonresults-teams-table").querySelector(".tabulator-tableholder").style.overflow = "hidden"; } @@ -479,7 +485,7 @@ function createTeamNameAndLogo(code, teamName) { * @param {object} drivers all driver's results race by race */ function addDriversDataToTeams(drivers) { - drivers.forEach(function (elem) { + drivers.slice(0, drivers.length-1).forEach(function (elem) { let data = teamsTable.getData() elem.slice(3).forEach((pair, index) => { let teamForRace = pair[pair.length - 1] diff --git a/front/styles.css b/front/styles.css index 671c77cf..50cf5a7b 100644 --- a/front/styles.css +++ b/front/styles.css @@ -488,6 +488,29 @@ a.bi-linkedin:hover { transition: color 0.4s; } +.driver1-number.little, .driver2-number.little{ + font-size: 13px; + height: 27px; + padding-top: 5px; +} + +.avg-comparison{ + display: flex; + height: 27px; + gap: 70px; +} + +.driver1-avg, .driver2-avg{ + font-size: 18px; +} + +.avg-separator{ + width: 2px; + height: 20px; + margin-top: 3px; + background-color: #dedde6; +} + .toast-error{ color: #ff4949 !important; } @@ -1039,7 +1062,8 @@ a.bi-linkedin:hover { [tabulator-field="driver"], [tabulator-field="points"], -[tabulator-field="team"]{ +[tabulator-field="team"], +[tabulator-field="pos"]{ background-color: #464166 !important; } @@ -1056,7 +1080,7 @@ a.bi-linkedin:hover { } -#seasonresults-table { +#seasonresults-table, #seasonresults-teams-table { background-color: transparent !important; border: none !important; } @@ -1119,16 +1143,27 @@ a.bi-linkedin:hover { border: none !important; } +[role="columnheader"][tabulator-field="driver"], [role="columnheader"][tabulator-field="points"] { + font-family: "Formula1Bold"; +} + [tabulator-field="driver"] { border-right: 1.5px solid #797599 !important; transition: color 0.3s, background-color 0.3s, border-color 0.3s; } +[tabulator-field="pos"] { + border-right: 1.5px solid #797599 !important; + transition: color 0.3s, background-color 0.3s, border-color 0.3s; + font-family: "Formula1Bold"; +} + [tabulator-field="points"] { border-left: 1.5px solid #797599 !important; border-right: none !important; transition: color 0.3s, background-color 0.3s, border-color 0.3s; + font-family: "Formula1Bold"; } .main-viewer-section .tabulator-col { @@ -1174,7 +1209,7 @@ a.bi-linkedin:hover { color: white !important; } -.tabulator-row:hover [tabulator-field="driver"] { +.tabulator-row:hover [tabulator-field="driver"], .tabulator-row:hover [tabulator-field="pos"]{ color: #110f24; background-color: #dedde6 !important; border-right: 1.5px solid #dedde6 !important; @@ -1683,7 +1718,7 @@ a.bi-linkedin:hover { transition: color 0.4s; } -#bestrh2h .name-H2H{ +#bestrh2h .name-H2H, #raceh2h .name-H2H, #qualih2h .name-H2H{ display: flex; justify-content: space-between; } @@ -1899,6 +1934,10 @@ a.bi-linkedin:hover { background-color: transparent; } +.driver1-number::selection, .driver2-number::selection{ + background-color: transparent; +} + .custom-disabled { background-color: -internal-light-dark(rgba(239, 239, 239, 0.3), rgba(59, 59, 59, 0.3)); } @@ -1906,12 +1945,12 @@ a.bi-linkedin:hover { .rounded-input:hover { border-color: #cecece; - } .rounded-input:focus { outline: 0px solid transparent; border-color: white; + color: white; } .confirm-area { @@ -2502,13 +2541,14 @@ a.bi-linkedin:hover { background-color: transparent; } + .custom-input-number:hover { - color: white; background-color: #292738; - + border-color: #cecece; } .custom-input-number:focus { + color: white; outline: 0px solid transparent; border-color: white; } @@ -2732,16 +2772,15 @@ input::-webkit-inner-spin-button { } #objectiveButton{ - padding-left: 6px; margin-top: 5px !important; - color: #ebebee; + max-width: 260px !important; } .first-component, .second-component{ width: 50%; } -#edit_teams i{ +#edit_teams .team-viewer i{ transition: color 0.4s; font-size: 20px; color: #dedde6; @@ -2755,12 +2794,19 @@ input::-webkit-inner-spin-button { } -#edit_teams i:hover{ +#edit_teams .team-viewer i:hover{ cursor: pointer; color: white !important; background-color: #6f698f !important; } +.q-label{ + background-color: red; + color: white; + border-radius: 5px; + padding: 3px; +} + .component-subtitle{ font-size: 20px; display: flex; diff --git a/launcher/version.conf b/launcher/version.conf index 5849151f..d2634851 100644 --- a/launcher/version.conf +++ b/launcher/version.conf @@ -1 +1 @@ -1.7.5 \ No newline at end of file +1.7.6 \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 2534284c..5df83432 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "Database Editor F1M23", - "version": "1.7.5", + "version": "1.7.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "Database Editor F1M23", - "version": "1.7.5", + "version": "1.7.6", "license": "LGPL-3.0-or-later", "dependencies": { "bootstrap": "^5.3.2", diff --git a/package.json b/package.json index bfebb53a..8268ed46 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Database Editor F1M23", - "version": "1.7.5", + "version": "1.7.6", "description": "A tool that will let you edit your save file from F1M23", "main": "main.js", "scripts": {