Merge pull request #654 from Klimatbyran/staging

Deploy to production
Klimatbyran · Jun 19, 2024 · 708d11d · 708d11d
2 parents 01030d4 + 4a0afd1
commit 708d11d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/components/CompanyView.tsx b/components/CompanyView.tsx
@@ -66,6 +66,7 @@ const ComparisonContainer = styled.div`
   position: relative;
   border-radius: 8px;
   display: flex;
+  padding-bottom: 2rem;
 `
 
 type CompanyViewProps = {

diff --git a/components/RegionalView.tsx b/components/RegionalView.tsx
@@ -103,6 +103,7 @@ const ComparisonContainer = styled.div<{ dataView: string }>`
   display: flex;
   margin-top: ${({ dataView }) => (dataView === 'karta' ? '0' : '56px')};
   min-height: 400px;
+  padding-bottom: 2rem;
 
   @media only screen and (${devices.tablet}) {
     min-height: 520px;

diff --git a/data/companies/company-data.json b/data/companies/company-data.json
diff --git a/data/companies/companyData.xlsx b/data/companies/companyData.xlsx
diff --git a/utils/createMunicipalityList.tsx b/utils/createMunicipalityList.tsx
@@ -216,6 +216,15 @@ export const municipalityColumns = (
       }
     }
 
+    if (datasetKey === 'upphandlingarna') {
+      return (rowDataA: Row<RowData>, rowDataB: Row<RowData>) => {
+        const aProcurementDemands = rowDataA.original.formattedDataPoint
+        const bProcurementDemands = rowDataB.original.formattedDataPoint
+
+        return aProcurementDemands.localeCompare(bProcurementDemands)
+      }
+    }
+
     // By default, use the standard @tanstack/table sorting functions.
     return undefined
   }