Team4388/ScoutingApp2022
1
0
Fork 0
mirror of https://github.com/Team4388/ScoutingApp2022.git synced 2026-06-09 00:38:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

dashboard fix

Browse Source
This commit is contained in:
Aquaticholic
2022-04-08 19:48:37 +01:00
parent 421d3e01fb
commit 253d27465c
11 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webserver/build/asset-manifest.json
+3 -3
View File
@@ -1,17 +1,17 @@
{ {
"files": { "files": {
"main.css": "/static/css/main.b03461c0.css", "main.css": "/static/css/main.b03461c0.css",
"main.js": "/static/js/main.8a15d831.js", "main.js": "/static/js/main.36f65ff1.js",
"static/js/787.f3328bc8.chunk.js": "/static/js/787.f3328bc8.chunk.js", "static/js/787.f3328bc8.chunk.js": "/static/js/787.f3328bc8.chunk.js",
"service-worker.js": "/service-worker.js", "service-worker.js": "/service-worker.js",
"static/media/logo.svg": "/static/media/logo.6ce24c58023cc2f8fd88fe9d219db6c6.svg", "static/media/logo.svg": "/static/media/logo.6ce24c58023cc2f8fd88fe9d219db6c6.svg",
"index.html": "/index.html", "index.html": "/index.html",
"main.b03461c0.css.map": "/static/css/main.b03461c0.css.map", "main.b03461c0.css.map": "/static/css/main.b03461c0.css.map",
"main.8a15d831.js.map": "/static/js/main.8a15d831.js.map", "main.36f65ff1.js.map": "/static/js/main.36f65ff1.js.map",
"787.f3328bc8.chunk.js.map": "/static/js/787.f3328bc8.chunk.js.map" "787.f3328bc8.chunk.js.map": "/static/js/787.f3328bc8.chunk.js.map"
}, },
"entrypoints": [ "entrypoints": [
"static/css/main.b03461c0.css", "static/css/main.b03461c0.css",
"static/js/main.8a15d831.js" "static/js/main.36f65ff1.js"
] ]
} }
webserver/build/index.html
+1 -1
View File
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#00a65a"/><meta name="description" content="Ridgebotics Scouting App 2022"/><meta name="viewport" content="width=device-width,user-scalable=no"><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Scouting 2022</title><script defer="defer" src="/static/js/main.8a15d831.js"></script><link href="/static/css/main.b03461c0.css" rel="stylesheet"></head><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></html> <!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#00a65a"/><meta name="description" content="Ridgebotics Scouting App 2022"/><meta name="viewport" content="width=device-width,user-scalable=no"><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Scouting 2022</title><script defer="defer" src="/static/js/main.36f65ff1.js"></script><link href="/static/css/main.b03461c0.css" rel="stylesheet"></head><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></html>
webserver/build/service-worker.js
+1 -1
View File
File diff suppressed because one or more lines are too long
webserver/build/static/js/main.8a15d831.js → webserver/build/static/js/main.36f65ff1.js
+3 -3
View File
File diff suppressed because one or more lines are too long
webserver/build/static/js/main.8a15d831.js.LICENSE.txt → webserver/build/static/js/main.36f65ff1.js.LICENSE.txt
View File
webserver/build/static/js/main.8a15d831.js.map → webserver/build/static/js/main.36f65ff1.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
webserver/src/App.jsx
+1
View File
@@ -19,6 +19,7 @@ import { ProcessedDataBucketProvider } from "./ProcessedDataBucketContext";
import NotesPage from "./Pages/NotesPage"; import NotesPage from "./Pages/NotesPage";
function App() { function App() {
console.log("WHAT THE FUCK")
const darkTheme = createTheme({ const darkTheme = createTheme({
// Theme settings // Theme settings
palette: { palette: {
webserver/src/Pages/DashboardPage/DashboardPage.jsx
+3
View File
@@ -4,6 +4,7 @@ import { ProcessedDataBucketContext, useProcessedDataBucket } from "../../Proces
import { DataGrid } from "@mui/x-data-grid"; import { DataGrid } from "@mui/x-data-grid";
import { Box } from "@mui/material"; import { Box } from "@mui/material";
import AnalyticsPanel from "./AnalyticsPanel"; import AnalyticsPanel from "./AnalyticsPanel";
import { getProcessedDataBucket, updateProcessedDataBucket } from "../../ProcessedDataBucket";
//https://ag-grid.com/react-data-grid/ //https://ag-grid.com/react-data-grid/
import { AgGridReact } from "ag-grid-react"; import { AgGridReact } from "ag-grid-react";
@@ -31,7 +32,9 @@ const DashboardPage = () => {
// ], // ],
// }; // };
// }; // };
let {localdb} = useLocalDb();
let { processedDataBucket, setProcessedDataBucket } = useProcessedDataBucket(); let { processedDataBucket, setProcessedDataBucket } = useProcessedDataBucket();
// updateProcessedDataBucket(localdb, setProcessedDataBucket);
let rowData = []; let rowData = [];
if (processedDataBucket != null) { if (processedDataBucket != null) {
webserver/src/Pages/InputPage.jsx
+1
View File
@@ -66,6 +66,7 @@ const InputPage = () => {
localdb.all().then((res) => { localdb.all().then((res) => {
let old_doc = { let old_doc = {
$id: id, $id: id,
// type: "match",
fouls: "0", fouls: "0",
fouls_tech: "0", fouls_tech: "0",
flipped: false, flipped: false,
webserver/src/ProcessedDataBucket.jsx
+22 -11
View File
@@ -1,10 +1,10 @@
const processSchedule = (doc) => {}; const processSchedule = (doc) => {};
const createDefaultTeamData = (doc, teamData) => { const createDefaultTeamData = (team_number, teamData) => {
//if there's no processed data on a team yet, create a default data entry //if there's no processed data on a team yet, create a default data entry
if (typeof teamData[doc.team_number] === "undefined") { if (typeof teamData[team_number] === "undefined") {
teamData[doc.team_number] = { teamData[team_number] = {
team_number: doc.team_number, team_number: team_number,
matches_played: 0, matches_played: 0,
notes: [], notes: [],
data_sets: { data_sets: {
@@ -88,15 +88,26 @@ export function updateProcessedDataBucket(db, setProcessedDataBucket) {
return; return;
} }
let thisTeamData = teamData[doc.team_number]; let first_two_letters = doc.$id.substring(0,2);
if (doc.type === "match") { let is_a_match = first_two_letters === "qm"
createDefaultTeamData(doc, teamData); || first_two_letters === "qf"
|| first_two_letters === "sf"
|| first_two_letters === "fi"
console.log(first_two_letters + is_a_match);
// if (doc.type === "match") {
if(is_a_match){
// if (doc.$id.substring(0,2)) {
let team_num = doc.$id.split("_")[1];
console.log(doc);
createDefaultTeamData(team_num, teamData);
let thisTeamData = teamData[team_num];
processMatch(doc, thisTeamData); processMatch(doc, thisTeamData);
} }
if (doc.type === "notes") { // if (doc.type === "notes") {
createDefaultTeamData(doc, teamData); // createDefaultTeamData(doc, teamData);
thisTeamData.notes.push(doc.notes); // thisTeamData.notes.push(doc.notes);
} // }
}); });
setProcessedDataBucket({ teamData: teamData, matchData: matchData }); setProcessedDataBucket({ teamData: teamData, matchData: matchData });
}) })
webserver/src/ProcessedDataBucketContext.jsx
+4 -1
View File
@@ -1,4 +1,4 @@
import React, { useContext, useState } from "react"; import React, { useContext, useState, useEffect} from "react";
import { useLocalDb } from "./DbContext.jsx"; import { useLocalDb } from "./DbContext.jsx";
import { ProcessedDataBucket } from "./ProcessedDataBucket.jsx"; import { ProcessedDataBucket } from "./ProcessedDataBucket.jsx";
import { getProcessedDataBucket, updateProcessedDataBucket } from "./ProcessedDataBucket"; import { getProcessedDataBucket, updateProcessedDataBucket } from "./ProcessedDataBucket";
@@ -16,5 +16,8 @@ export function ProcessedDataBucketProvider({ children }) {
// console.log("CHANGES"); // console.log("CHANGES");
updateProcessedDataBucket(localdb, setProcessedDataBucket); updateProcessedDataBucket(localdb, setProcessedDataBucket);
}); });
// useEffect(()=>{
// updateProcessedDataBucket(localdb, setProcessedDataBucket);
// }, [setProcessedDataBucket]);
return <ProcessedDataBucketContext.Provider value={{ processedDataBucket, setProcessedDataBucket }}>{children}</ProcessedDataBucketContext.Provider>; return <ProcessedDataBucketContext.Provider value={{ processedDataBucket, setProcessedDataBucket }}>{children}</ProcessedDataBucketContext.Provider>;
} }