#221 - Voyager: Made "my assignments" tab only show the one team you're assigned to

.devcontainer/Dockerfile

@@ -6,13 +6,19 @@ FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
 # Install MongoDB command line tools if on buster and x86_64 (arm64 not supported)
 ARG MONGO_TOOLS_VERSION=5.0
 RUN . /etc/os-release \
-	&& if [ "${VERSION_CODENAME}" = "buster" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \
-		curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \
-		&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \
-		&& apt-get update && export DEBIAN_FRONTEND=noninteractive \
-		&& apt-get install -y mongodb-database-tools mongodb-mongosh \
-		&& apt-get clean -y && rm -rf /var/lib/apt/lists/*; \
-	fi
+    && if [ "${VERSION_CODENAME}" = "bullseye" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \
+        curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \
+        && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \
+        && apt-get update && export DEBIAN_FRONTEND=noninteractive \
+        && apt-get install -y mongodb-database-tools mongodb-mongosh \
+        && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \
+	  elif [ "${VERSION_CODENAME}" = "buster" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \
+        curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \
+        && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \
+        && apt-get update && export DEBIAN_FRONTEND=noninteractive \
+        && apt-get install -y mongodb-database-tools mongodb-mongosh \
+        && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \
+    fi
 
 # [Optional] Uncomment this section to install additional OS packages.
 # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

.devcontainer/setup.sh

@@ -23,5 +23,42 @@ for dbsfile in "${dbsfiles[@]}"; do
 fi
 done
 
+# Detect OS version
+detect_os_version() {
+    if [ -f /etc/os-release ]; then
+        . /etc/os-release
+        OS_VERSION=$VERSION_CODENAME
+    else
+        echo "Unsupported OS: /etc/os-release not found"
+        exit 1
+    fi
+}
+
+# Set NODE_VARIANT based on OS version
+set_node_variant() {
+    case $OS_VERSION in
+        "bullseye")
+            export VARIANT="18-bullseye"
+            ;;
+        "buster")
+            export VARIANT="18-buster"
+            ;;
+        *)
+            echo "Unsupported OS version: $OS_VERSION"
+            exit 1
+            ;;
+    esac
+}
+
 # Install node modules
 yarn setup
+
+# Main script execution
+detect_os_version
+set_node_variant
+
+# Make setup.sh executable if not already
+chmod +x setup.sh
+
+# Execute docker-compose with the appropriate VARIANT
+docker-compose up --build

.gitignore

@@ -23,3 +23,4 @@ yarn-error.log
 # below: temporary
 voyager/static/*.css*
 voyager/.sst
+scoutradioz-utilities/types/utilities.d.ts

voyager/package.json

@@ -73,7 +73,7 @@
     "svelte-markdown": "^0.4.1",
     "tailwindcss": "^3.4.1",
     "typescript": "^5.3.2",
-    "vite": "^5.1.3",
+    "vite": "^5.2.12",
     "workbox-precaching": "^7.0.0",
     "workbox-routing": "^7.0.0"
   },

voyager/src/routes/scouting/match/+page.svelte

@@ -13,11 +13,11 @@
 	setPageTitle(msg('scouting.match'), msg('scouting.scheduleVersion', {checksum: data.checksum}));
 
 	const tabs = [
-		{ id: 'mine', icon: 'person', label: 'Assigned' },
+		{ id: 'mine', icon: 'person', label: 'Mine' },
 		{ id: 'all', icon: 'groups', label: 'All' }
 	];
 
-	$: initialActiveIndex = data.myMatches.length ? 0 : 1;
+	$: initialActiveIndex = data.myTeams.length ? 0 : 1;
 
 	const { snackbar } = getPageLayoutContexts();
 	addRefreshButtonFunctionality(async () => {
@@ -52,7 +52,7 @@
 	</p>
 
 	<SlidingTabs {tabs} {initialActiveIndex}>
-		<MatchAssignmentList slot="1" matches={data.myMatches} firstMatchNumber={data.firstMatchNumber} />
+		<MatchAssignmentList slot="1" matches={data.myTeams} firstMatchNumber={data.firstMatchNumber} />
 		<MatchAssignmentList slot="2" matches={data.allMatches} firstMatchNumber={data.firstMatchNumber} />
 	</SlidingTabs>
 </section>

voyager/src/routes/scouting/match/+page.ts

@@ -36,6 +36,10 @@ export const load: PageLoad = async ({ fetch, parent, url }) => {
 	const myMatches = grouped.filter(match =>
 		match.some(asg => asg.assigned_scorer?.id === user_id)
 	).slice(0, maxNumMatches);
+
+	const myTeams = myMatches.map(match =>
+		match.filter(asg => asg.assigned_scorer?.id === user_id)
+	);
 
 	const allMatches = grouped.slice(0, maxNumMatches);
 
@@ -49,5 +53,6 @@ export const load: PageLoad = async ({ fetch, parent, url }) => {
 	}
 	let checksum = syncStatus.data.checksum.substring(0, 3) as string;
 
-	return { myMatches, allMatches, firstMatchNumber, checksum };
+	return { myMatches, myTeams, allMatches, firstMatchNumber, checksum };
+
 };

voyager/src/routes/scouting/pit/+page.svelte

@@ -9,7 +9,7 @@
 	export let data: PageData;
 
 	const tabs = [
-		{ id: 'mine', icon: 'person', label: 'Assigned' },
+		{ id: 'mine', icon: 'person', label: 'Mine' },
 		{ id: 'partner', icon: 'group', label: "Partner's" },
 		{ id: 'all', icon: 'groups', label: 'All' }
 	];

voyager/src/routes/sync/LeadQRCode.svelte

@@ -141,9 +141,9 @@
 </script>
 
 <section class="pad grid grid-cols-1 place-items-center gap-4">
-	<div class="grid grid-cols-2 gap-4">
-		<div>
-			<Select variant="filled" bind:value={qrCodeType} on:MDCSelect:change={handleChange}>
+	<div class={`grid ${qrCodeType === 'pitscouting' ? 'grid-cols-1' : 'grid-cols-2'} gap-4`}>
+		<div style="width: 100%; display: flex; justify-content: center;">
+			<Select variant="filled" bind:value={qrCodeType} on:MDCSelect:change={handleChange} style={`width: ${qrCodeType === 'pitscouting' ? '400px' : 'auto'}; `}>
 				<Option value="matchscouting">{msg('scouting.match')}</Option>
 				<Option value="pitscouting">{msg('scouting.pit')}</Option>
 				<Option value="metadata">{msg('qrsync.usersAndTeams')}</Option>
@@ -186,4 +186,4 @@
 		</div>
 	{/if}
 	<QrCodeDisplay data={base64Data} />
-</section>
+</section>