Merge branch 'develop' into dependency_updates

apps/skde/pages/sykehusprofil/index.tsx

@@ -30,6 +30,7 @@ import { UnitFilterMenu } from "../../src/components/HospitalProfile/UnitFilterM
 import { TurnDeviceBox } from "../../src/components/HospitalProfile/TurnDeviceBox";
 import { URLs } from "types";
 import { LayoutHead } from "../../src/components/LayoutHead";
+import { SelectedIndicatorTable } from "../../src/components/HospitalProfile/SelectedIndicatorTable";
 
 export const Skde = (): JSX.Element => {
   // States
@@ -215,6 +216,19 @@ export const Skde = (): JSX.Element => {
                 )}
               </Grid>
 
+              <Grid size={{ xs: 12 }}>
+                {showRotateMessage ? (
+                  TurnDeviceMessage
+                ) : (
+                  <SelectedIndicatorTable
+                    unitName={unitName}
+                    titlePadding={titlePadding}
+                    titleStyle={titleStyle}
+                    lastYear={lastYear}
+                  />
+                )}
+              </Grid>
+
               <Grid size={{ xs: 12 }}>
                 {showRotateMessage ? (
                   TurnDeviceMessage

apps/skde/src/components/Atlas/AtlasLayout/AtlasLayout.tsx

@@ -2,6 +2,7 @@ import { LayoutHead } from "../../LayoutHead";
 import { Header } from "./Header";
 import { Footer } from "../../Footer";
 import { PageWrapper } from "../../StyledComponents/PageWrapper";
+import { Box } from "@mui/material";
 
 interface Props {
   children: React.ReactNode;
@@ -12,14 +13,16 @@ interface Props {
 export function AtlasLayout({ children, lang }: Props) {
   return (
     <PageWrapper>
-      <LayoutHead
-        title="Helseatlas"
-        content="The healthcare atlases on Helseatlas.no are a tool for comparing the population's use of health services in different geographical areas, regardless of where the patients actually receive treatment."
-        href="/helseatlas/img/logos/favicon.ico"
-      />
-      <Header lang={lang} />
-      {children}
-      <Footer page="helseatlas" maxWidth={"xxl"} />
+      <Box sx={{ backgroundColor: "white" }}>
+        <LayoutHead
+          title="Helseatlas"
+          content="The healthcare atlases on Helseatlas.no are a tool for comparing the population's use of health services in different geographical areas, regardless of where the patients actually receive treatment."
+          href="/helseatlas/img/logos/favicon.ico"
+        />
+        <Header lang={lang} />
+        {children}
+        <Footer page="helseatlas" maxWidth={"xxl"} />
+      </Box>
     </PageWrapper>
   );
 }