Merge branch 'main' of https://github.com/longmetal7127/scouting2024

longmetal7127 · Mar 20, 2024 · 1b17f12 · 1b17f12
2 parents 7d62235 + 7cfe598
commit 1b17f12
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/index.js b/index.js
@@ -122,7 +122,7 @@ function editTeam(globalid) {
 }
 
 function newMatch(globalid) {
-  window.open(`pages/matchInfo.html?globalid=${globalid}&match=1`, "_self");  //well, it defaults to new page so we will try _self
+  window.open(`pages/matchinfo.html?globalid=${globalid}&match=1`, "_self");  //well, it defaults to new page so we will try _self
 }
 
 async function syncDataToAzureSQL(){

diff --git a/pages/matchinfo.html b/pages/matchinfo.html
@@ -6,12 +6,12 @@
     <title>Match Info</title>
 
     <link rel="stylesheet" href="../css/teams.css" />
-    <link rel="stylesheet" href="css\offline-language-english.css" />
+    <link rel="stylesheet" href="../css/offline-language-english.css" />
     <link rel="stylesheet" href="../css/" />
     <link rel="stylesheet" href="../css/matchinfo.css"/>
 
     <script src="../js/dexie.js"></script>
-    <script href="manifest.json"></script>
+    <script href="../manifest.json"></script>
     <script src="../js/offline.min.js"></script>
 
 

diff --git a/pages/matchinfo.js b/pages/matchinfo.js
@@ -1,5 +1,4 @@
 
-
 // BUTTONS ---------------------------------------------------------
 document.addEventListener("DOMContentLoaded", function() {
 const countElement1 = document.getElementById('count1');

diff --git a/testing/dexie.html b/testing/dexie.html
@@ -8,7 +8,7 @@
         <link rel="shortcut icon" href="#">       
     </head>
 <body>
-    <h2>Dexie DB Dump</h2>
+    <h2>Dexie DB Info</h2>
     <div id="dbContent"></div>
 
     <!-- Dexie.js CDN -->

diff --git a/testing/dexie.js b/testing/dexie.js
@@ -1,8 +1,7 @@
 // Define your Dexie database
 const db = new Dexie("Team Tracking App");
-db.version(15).stores({ 
-    teams: "++indexid, globalid, clienttimestamp, teamname, teamnumber, teamschool, alliancescore, active", 
-    preferences: "++indexid, globalid, clienttimestamp, match, moreinfo, startingpos, Leaveszone, scores1amp, scores1speaker, picksup, scores2amp, scores2speaker, preferredScoringMethod, preferredIntakeMethod, prefintake, spotlight, trap, alone, hangsWithAnother, attemptsSpotlight, coop",
+db.version(16).stores({ 
+    teams: "++indexid, globalid, clienttimestamp, teamname, teamnumber, teamschool, alliancescore, active, moreinfo, startingpos, Leaveszone, scores1amp, scores1speaker, picksup, scores2amp, scores2speaker, preferredScoringMethod, preferredIntakeMethod, prefintake, spotlight, trap, alone, hangsWithAnother, attemptsSpotlight, coop",
     matches: "++indexid, globalid, clienttimestamp, match, remoteid, active, rank, matchnumber, count1, count2, count3, count4, count5, count6, count7, stage, hangs, harmony, otherinfo"
   });