2023-02-05 13:40:09 -05:00
8 changed files with 170 additions and 96 deletions
--- a/components/StackedBarGraph.tsx
+++ b/components/StackedBarGraph.tsx
@ -53,6 +53,14 @@ export type StackedBarProps = {
  scalePadding?: number;
  /** Margin for each item in the legend */
  itemMargin?: string;
+  /** Hide the first data value in tooltip*/
+  hideDataValueInTooltip?: boolean;
+  //** Top tooltip label */
+  tooltipTopLabel?: string;
+  //** Bottom tooltip label */
+  tooltipBottomLabel?: string;
+  //** Display percentage */
+  displayPercentage?: boolean;
 };

 let tooltipTimeout: number;
@ -79,6 +87,10 @@ export const StackedBarGraphVertical = withTooltip<
    tooltipData,
    hideTooltip,
    showTooltip,
+    hideDataValueInTooltip,
+    tooltipBottomLabel = "",
+    tooltipTopLabel = "",
+    displayPercentage,
  }: StackedBarProps & WithTooltipProvidedProps<TooltipData>) => {
    const yTotals = data.reduce((allTotals, currCategory) => {
      const yTotal = keys.reduce((categoryTotal, k) => {
@ -230,8 +242,15 @@ export const StackedBarGraphVertical = withTooltip<
            left={tooltipLeft}
            header={tooltipData.key}
          >
-            <p>{tooltipData.bar.data[tooltipData.key]}</p>
-            <p>{getCategory(tooltipData.bar.data)}</p>
+            {hideDataValueInTooltip ? null : (
+              <p>
+                {tooltipTopLabel} {tooltipData.bar.data[tooltipData.key]}
+                {displayPercentage ? "%" : ""}
+              </p>
+            )}
+            <p>
+              {tooltipBottomLabel} {getCategory(tooltipData.bar.data)}
+            </p>
          </TooltipWrapper>
        ) : null}
      </div>
@ -261,6 +280,10 @@ export const StackedBarGraphHorizontal = withTooltip<
    tooltipData,
    hideTooltip,
    showTooltip,
+    hideDataValueInTooltip,
+    tooltipBottomLabel = "",
+    tooltipTopLabel = "",
+    displayPercentage,
  }: StackedBarProps & WithTooltipProvidedProps<TooltipData>) => {
    const yTotals = data.reduce((allTotals, currCategory) => {
      const yTotal = keys.reduce((categoryTotal, k) => {
@ -409,8 +432,15 @@ export const StackedBarGraphHorizontal = withTooltip<
            left={tooltipLeft}
            header={tooltipData.key}
          >
-            <p>{tooltipData.bar.data[tooltipData.key]}</p>
-            <p>{getCategory(tooltipData.bar.data)}</p>
+            {hideDataValueInTooltip ? null : (
+              <p>
+                {tooltipTopLabel} {tooltipData.bar.data[tooltipData.key]}
+                {displayPercentage ? "%" : ""}
+              </p>
+            )}
+            <p>
+              {tooltipBottomLabel} {getCategory(tooltipData.bar.data)}
+            </p>
          </TooltipWrapper>
        ) : null}
      </div>
--- a/data/academics.ts
+++ b/data/academics.ts
@ -875,6 +875,12 @@ export const A12 = [
 ];

 export const A12i = [
+  {
+    category: "CS145",
+    "1-4": 1,
+    "5-7": 10,
+    "8-10": 23,
+  },
  {
    category: "CS146",
    "1-4": 1,
@ -1060,7 +1066,7 @@ export const A14 = [
  },
  {
    text: "Carmen Bruni",
-    value: 10,
+    value: 9,
  },
  {
    text: "Michael Wallace",
@ -1234,101 +1240,101 @@ export const A15 = [
 export const A16 = [
  {
    category: "1A",
-    "0-30": 0.04,
+    "0-30": 4,
    "30-60": 0,
-    "60-70": 0.04,
-    "70-80": 0.152,
-    "80-90": 0.495,
-    "90-95": 0.192,
-    "95-100": 0.081,
+    "60-70": 4,
+    "70-80": 15.2,
+    "80-90": 49.5,
+    "90-95": 19.2,
+    "95-100": 8.1,
  },
  {
    category: "1B",
-    "0-30": 0.04,
-    "30-60": 0.01,
-    "60-70": 0.091,
-    "70-80": 0.232,
-    "80-90": 0.434,
-    "90-95": 0.121,
-    "95-100": 0.071,
+    "0-30": 4,
+    "30-60": 1,
+    "60-70": 9.1,
+    "70-80": 23.2,
+    "80-90": 43.4,
+    "90-95": 12.1,
+    "95-100": 7.1,
  },
  {
    category: "2A",
-    "0-30": 0.0208,
-    "30-60": 0.0312,
-    "60-70": 0.052,
-    "70-80": 0.2604,
-    "80-90": 0.4479,
-    "90-95": 0.1354,
-    "95-100": 0.0417,
+    "0-30": 2.08,
+    "30-60": 3.12,
+    "60-70": 5.2,
+    "70-80": 26.04,
+    "80-90": 44.79,
+    "90-95": 13.54,
+    "95-100": 4.17,
  },
  {
    category: "2B",
-    "0-30": 0.051,
+    "0-30": 5.1,
    "30-60": 0,
-    "60-70": 0.112,
-    "70-80": 0.296,
-    "80-90": 0.378,
-    "90-95": 0.133,
-    "95-100": 0.031,
+    "60-70": 11.2,
+    "70-80": 29.6,
+    "80-90": 37.8,
+    "90-95": 13.3,
+    "95-100": 3.1,
  },
  {
    category: "3A",
-    "0-30": 0.032,
-    "30-60": 0.033,
-    "60-70": 0.032,
-    "70-80": 0.149,
-    "80-90": 0.447,
-    "90-95": 0.245,
-    "95-100": 0.064,
+    "0-30": 3.2,
+    "30-60": 3.3,
+    "60-70": 3.2,
+    "70-80": 14.9,
+    "80-90": 44.7,
+    "90-95": 24.5,
+    "95-100": 6.4,
  },
  {
    category: "3B",
-    "0-30": 0.033,
-    "30-60": 0.033,
-    "60-70": 0.043,
-    "70-80": 0.108,
-    "80-90": 0.355,
-    "90-95": 0.312,
-    "95-100": 0.118,
+    "0-30": 3.3,
+    "30-60": 3.3,
+    "60-70": 4.3,
+    "70-80": 10.8,
+    "80-90": 35.5,
+    "90-95": 31.2,
+    "95-100": 11.8,
  },
  {
    category: "4A",
-    "0-30": 0.011,
-    "30-60": 0.032,
-    "60-70": 0.053,
-    "70-80": 0.129,
-    "80-90": 0.355,
-    "90-95": 0.312,
-    "95-100": 0.108,
+    "0-30": 1.1,
+    "30-60": 3.2,
+    "60-70": 5.3,
+    "70-80": 12.9,
+    "80-90": 35.5,
+    "90-95": 31.2,
+    "95-100": 10.8,
  },
  {
    category: "4B",
-    "0-30": 0.011,
-    "30-60": 0.033,
-    "60-70": 0.023,
-    "70-80": 0.149,
-    "80-90": 0.241,
-    "90-95": 0.138,
-    "95-100": 0.092,
+    "0-30": 1.1,
+    "30-60": 3.3,
+    "60-70": 2.3,
+    "70-80": 14.9,
+    "80-90": 24.1,
+    "90-95": 13.8,
+    "95-100": 9.2,
  },
  {
    category: "5A",
-    "0-30": 0.02,
-    "30-60": 0.04,
-    "60-70": 0.02,
-    "70-80": 0.039,
-    "80-90": 0.137,
+    "0-30": 2,
+    "30-60": 4,
+    "60-70": 2,
+    "70-80": 3.9,
+    "80-90": 13.7,
    "90-95": 0,
-    "95-100": 0.059,
+    "95-100": 5.9,
  },
  {
    category: "CAV",
    "0-30": 0,
    "30-60": 0,
-    "60-70": 0.03774,
-    "70-80": 0.28302,
-    "80-90": 0.67924,
+    "60-70": 3.774,
+    "70-80": 28.302,
+    "80-90": 67.924,
    "90-95": 0,
    "95-100": 0,
  },
@ -1470,7 +1476,7 @@ export const A19 = [
 export const A19i = [
  {
    category: "0",
-    value: 15,
+    value: 56,
  },
  {
    category: "1",
--- a/data/coop.ts
+++ b/data/coop.ts
@ -10,25 +10,45 @@ export const C1 = [
 ];

 export const C2 = [
+  {
+    text: "Pacific NW USA",
+    value: 3,
+  },
+  {
+    text: "West Coast CAN",
+    value: 12,
+  },
+  {
+    text: "Remote",
+    value: 2,
+  },
+  {
+    text: "East Coast Canada",
+    value: 1,
+  },
  {
    text: "Toronto",
-    value: 32,
+    value: 34,
  },
  {
    text: "California",
    value: 26,
  },
-  {
-    text: "West CAN",
-    value: 12,
-  },
  {
    text: "East USA",
    value: 11,
  },
  {
    text: "Waterloo",
-    value: 9,
+    value: 10,
+  },
+  {
+    text: "Chicago",
+    value: 1,
+  },
+  {
+    text: "Tokyo",
+    value: 1,
  },
 ];

--- a/data/demographics.ts
+++ b/data/demographics.ts
@ -199,7 +199,7 @@ export const D7 = [
  },
  {
    text: "GTA / Toronto",
-    value: 1,
+    value: 58,
  },
  {
    text: "United Arab Emirates",
--- a/data/post-grad.ts
+++ b/data/post-grad.ts
@ -190,35 +190,39 @@ export const P8 = [
  },
  {
    text: "Finance",
-    value: 1,
+    value: 8,
  },
  {
    text: "Cloud Computing",
-    value: 5,
-  },
-  {
-    text: "Artificial Intelligence",
-    value: 3,
-  },
-  {
-    text: "Robotics",
-    value: 1,
-  },
-  {
-    text: "Data Science",
    value: 6,
  },
  {
-    text: "Research",
+    text: "Artificial Intelligence",
+    value: 5,
+  },
+  {
+    text: "Operating System",
+    value: 2,
+  },
+  {
+    text: "Robotics",
    value: 3,
  },
  {
-    text: "Security",
-    value: 1,
+    text: "Data Science",
+    value: 10,
+  },
+  {
+    text: "Research",
+    value: 6,
+  },
+  {
+    text: "Cybersecurity",
+    value: 2,
  },
  {
    text: "Hardware",
-    value: 2,
+    value: 4,
  },
  {
    text: "Mobile Development",
@ -228,4 +232,12 @@ export const P8 = [
    text: "Computer Networking",
    value: 2,
  },
+  {
+    text: "Programming Languages",
+    value: 5,
+  },
+  {
+    text: "Compilers",
+    value: 1,
+  },
 ];
--- a/pages/academics.tsx
+++ b/pages/academics.tsx
@ -281,6 +281,7 @@ export default function Academics() {
          ]}
          data={A16}
          margin={barGraphMargin}
+          displayPercentage={true}
        />
      </ComponentWrapper>

--- a/pages/coop.tsx
+++ b/pages/coop.tsx
@ -216,7 +216,7 @@ export default function CoopPage() {
      {/* C7v */}
      <ComponentWrapper
        heading="What was your coop evaluation rating?"
-        bodyText="Ratings were pretty positive overall! It seems that it's not extremely hard to get an outstanding rating!"
+        bodyText="Ratings were pretty positive overall! It seems that it's not extremely hard to get an outstanding rating! The y-axis represents the co-op term while the x-axis represents the number of students who have given a rating."
      >
        <div>
          <StackedBarGraphHorizontal
@ -231,6 +231,8 @@ export default function CoopPage() {
            ]}
            data={C7v}
            margin={barGraphMargin}
+            displayPercentage
+            tooltipBottomLabel="Coop Term: "
          />
        </div>
      </ComponentWrapper>
@ -256,6 +258,8 @@ export default function CoopPage() {
            ]}
            data={C7vi}
            margin={barGraphMargin}
+            tooltipBottomLabel="Coop Term: "
+            displayPercentage
          />
        </div>
      </ComponentWrapper>
@ -296,6 +300,8 @@ export default function CoopPage() {
            colorRange={[Color.primaryAccent, Color.secondaryAccentLight]}
            data={C7viii}
            margin={barGraphMargin}
+            displayPercentage={true}
+            tooltipBottomLabel="Coop term: "
          />
        </div>
      </ComponentWrapper>
--- a/pages/lifestyle-and-interests.tsx
+++ b/pages/lifestyle-and-interests.tsx
@ -226,9 +226,8 @@ export default function Demographics() {
          width={isMobile ? pageWidth / 1.5 : 800}
          height={DefaultProp.graphHeight}
          wordPadding={7}
-          desktopMaxFontSize={70}
+          desktopMaxFontSize={75}
          mobileMaxFontSize={48}
-          randomSeed={0.5}
        />
      </ComponentWrapper>