Unmerge

This reverts commit 064000b.

Author: Isak-Kallini

src/routes/(app)/positions/[id]/+page.svelte

@@ -14,62 +14,22 @@
   import type { PageData } from "./$types";
   export let data: PageData;
 
-  const mandateStatsCutoffYears = 7;
-
-  type MandateWithMember = Prisma.MandateGetPayload<{
-    include: { member: true };
-  }>;
-
-  $: groupedByYear = data.mandates.reduce<Record<string, MandateWithMember[]>>(
-    (acc, mandate) => {
-      let year = mandate.startDate.getFullYear().toString();
-      if (mandate.endDate.getFullYear() !== mandate.startDate.getFullYear())
-        year += `-${mandate.endDate.getFullYear()}`;
-      if (!acc[year]) acc[year] = [];
-      acc[year]!.push(mandate);
-      return acc;
-    },
-    {},
-  );
+  $: groupedByYear = data.mandates.reduce<
+    Record<
+      string,
+      Array<Prisma.MandateGetPayload<{ include: { member: true } }>>
+    >
+  >((acc, mandate) => {
+    let year = mandate.startDate.getFullYear().toString();
+    if (mandate.endDate.getFullYear() !== mandate.startDate.getFullYear())
+      year += `-${mandate.endDate.getFullYear()}`;
+    if (!acc[year]) acc[year] = [];
+    acc[year]!.push(mandate);
+    return acc;
+  }, {});
   $: years = Object.keys(groupedByYear).sort((a, b) =>
     b.localeCompare(a, languageTag()),
   );
-
-  // Mandates per årskurs
-  function getStudyYear(mandate: MandateWithMember): number | null {
-    const start = mandate.startDate;
-    const classYear = mandate.member.classYear;
-    if (!classYear || isNaN(start.getTime())) return null;
-
-    const startAcademicYear =
-      start.getMonth() >= 7
-        ? start.getFullYear() // Aug-Dec -> same year
-        : start.getFullYear() - 1; // Jan-Jul -> previous year
-
-    const studyYear = startAcademicYear - classYear + 1;
-    return studyYear >= 1 ? studyYear : null;
-  }
-  $: mandateYearRatios = (() => {
-    let totalMandateCount = 0;
-    const counts: Record<number, number> = {};
-    for (const mandate of data.mandates) {
-      const studyYear = getStudyYear(mandate);
-      if (studyYear === null || studyYear > mandateStatsCutoffYears) {
-        continue;
-      }
-      counts[studyYear] = (counts[studyYear] ?? 0) + 1;
-      totalMandateCount++;
-    }
-
-    // Dynamically generate stats for all årskurser present
-    return Object.keys(counts)
-      .map(Number)
-      .sort((a, b) => a - b)
-      .map((studyYear) => ({
-        studyYear,
-        percentage: counts ? (counts[studyYear]! / totalMandateCount) * 100 : 0,
-      }));
-  })();
   let isEditing = false;
   let isAdding = false;
 </script>
@@ -79,10 +39,7 @@
   class="mb-4 flex flex-col items-start gap-2 md:flex-row md:items-center md:gap-8"
 >
   {#if data.position.committee}
-    <a
-      href="/committees/{data.position.committee?.shortName}"
-      class="group self-start"
-    >
+    <a href="/committees/{data.position.committee?.shortName}" class="group">
       <figure
         class="h-32 w-32 transition-transform group-hover:scale-95 md:h-40 md:w-40"
       >
@@ -143,25 +100,6 @@
         {/each}
       </div>
     {/if}
-    {#if mandateYearRatios.length !== 0}
-      <div class="flex-box mt-4 w-full border-t pt-4">
-        <h2 class="flex items-center gap-2 text-lg">
-          {m.positions_historical_mandate_distribution_per_study_year()}
-          <span class="text-sm text-neutral-400">
-            ({mandateStatsCutoffYears}&nbsp;{m.positions_years()})
-          </span>
-        </h2>
-        {#each mandateYearRatios as { studyYear, percentage }}
-          <div class="flex w-64 flex-row items-center gap-2">
-            <div class="bar-label w-24">
-              {m.positions_study_year()}&nbsp;{studyYear}
-            </div>
-            <progress class="progress" value={percentage} max="100"></progress>
-            <div class="text-xs text-neutral-400">{percentage.toFixed(1)}%</div>
-          </div>
-        {/each}
-      </div>
-    {/if}
   </div>
 </div>
 

src/translations/en.json

@@ -850,8 +850,5 @@
   "positions_active": "Active",
   "positions_board_member": "Board member",
   "positions_apply_change": "Apply",
-  "positions_all_positions": "See all positions",
-  "positions_historical_mandate_distribution_per_study_year": "Historical mandate distribution per study year",
-  "positions_study_year": "Year",
-  "positions_years": "years"
+  "positions_all_positions": "See all positions"
 }

src/translations/sv.json

@@ -847,8 +847,5 @@
   "positions_active": "Aktiv",
   "positions_board_member": "Styrelsemedlem",
   "positions_apply_change": "Spara",
-  "positions_all_positions": "Se alla poster",
-  "positions_historical_mandate_distribution_per_study_year": "Historisk mandatfördelning per årskurs",
-  "positions_study_year": "Åk",
-  "positions_years": "år"
+  "positions_all_positions": "Se alla poster"
 }