added id/shortcode to family/student,

Author: Dropheart

app/components/Family.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+    <p class="text-center">ID: {{ family.id }}</p>
     <CardDetails>
       <strong>Parents:</strong>
       <Student :student="family.parents[0]!" />
@@ -24,5 +25,5 @@
 </template>
 
 <script setup lang="ts">
-const { family } = defineProps<{ family: IFamily}>();
+const { family } = defineProps<{ family: IFamily }>();
 </script>

app/components/Student.vue

@@ -30,6 +30,7 @@ const mildInterests = computed(() => {
     <CardTitle>
       <h3>{{ props.student.name }}</h3>
     </CardTitle>
+    <CardText class="text-center">{{ props.student.shortcode }}</CardText>
     <CardText v-if="props.student.aboutMe" class="mt-2">
       <strong>About Me:</strong>
       {{ props.student.aboutMe }}

app/pages/admin.vue

@@ -26,7 +26,12 @@ const filteredFamilies = ref<IFamily[]>(familyData.value);
 
 async function setApiState(state: State) {
   try {
-    if (!confirm('This will update the state of the website. Are you sure you want to do this?')) return;
+    if (
+      !confirm(
+        'This will update the state of the website. Are you sure you want to do this?'
+      )
+    )
+      return;
     await $fetch('/api/admin/state', {
       method: 'PUT',
       headers,
@@ -50,7 +55,10 @@ function filterFamilies() {
         family.parents.some(student =>
           student.shortcode.startsWith(search.value)
         ) ||
-        family.kids.some(student => student.shortcode.startsWith(search.value))
+        family.kids.some(student =>
+          student.shortcode.startsWith(search.value)
+        ) ||
+        family.id == search.value
     );
   }
 }
@@ -89,6 +97,12 @@ definePageMeta({
           <b>Freshers who successfully completed survey:</b>
           {{ statsData.registered_freshers }}
         </p>
+        <p>
+          <b>Minimum to reasonably expect (all parents + all kids):</b> {{ statsData.families * 2 + statsData.registered_freshers }}
+        </p>
+        <p>
+          <b>Maximum to unreasonably expect (all freshers + all parents)</b> {{ statsData.families * 2 + statsData.all_freshers }}
+        </p>
       </div>
     </div>
   </Card>
@@ -116,7 +130,7 @@ definePageMeta({
     <CardTitle>All families</CardTitle>
     <input
       class="my-2"
-      placeholder="search by shortcode"
+      placeholder="search by shortcode or family ID"
       v-model="search"
       @input="filterFamilies" />
     <div v-for="family of filteredFamilies" class="m-1 border-4 p-1">

app/utils/types.d.ts

@@ -21,6 +21,7 @@ declare const stateOptions = [
 declare type State = (typeof stateOptions)[number];
 
 declare type IFamily = {
+  id: number,
   parents: IStudent[],
   kids: IStudent[]
 }

hono/admin/admin.ts

@@ -289,7 +289,6 @@ export const admin = factory
   .get(
     '/all-families',
     grantAccessTo('admin'),
-    // zValidator('json', z.object({ shortcode: z.string() })),
     async ctx => {
       // This differs from the allocations/all-families as this uses our sensible types.
       const parent1 = aliasedTable(students, 'parent1');
@@ -301,7 +300,7 @@ export const admin = factory
         .innerJoin(parent1, eq(marriages.parent1, parent1.shortcode))
         .innerJoin(parent2, eq(marriages.parent2, parent2.shortcode));
 
-      const familiesToRet = [] as { parents: Student[]; kids: Student[] }[];
+      const familiesToRet = [] as { id: number, parents: Student[]; kids: Student[] }[];
 
       for (const family of familiesAndParents) {
         const familyId = family.marriage.id;
@@ -322,6 +321,7 @@ export const admin = factory
           .innerJoin(students, eq(families.kid, students.shortcode));
 
         familiesToRet.push({
+          id: familyId,
           // @ts-ignore This is an issue with Drizzle aliasedTable.
           parents: [family.parent1, family.parent2],
           kids: kids

hono/family/family.ts

@@ -342,6 +342,7 @@ export const family = factory
 
       return ctx.json(
         {
+          id: familyId,
           parents: [parent1[0], parent2[0]],
           kids: kids
         },

hono/types.ts

@@ -1,4 +1,4 @@
-import { string, type z } from 'zod';
+import { type z } from 'zod';
 import type { selectStudentSchema } from './family/schema';
 
 export const interestKeys = [