diff --git a/administration/src/bp-modules/ButtonBar.tsx b/administration/src/bp-modules/ButtonBar.tsx index b2f3a4dee..25bb616f9 100644 --- a/administration/src/bp-modules/ButtonBar.tsx +++ b/administration/src/bp-modules/ButtonBar.tsx @@ -1,6 +1,8 @@ import { Card } from '@blueprintjs/core' import styled from 'styled-components' +import dimensions from './constants/dimensions' + const ButtonBar = styled(Card)` width: 100%; padding: 15px; @@ -12,6 +14,7 @@ const ButtonBar = styled(Card)` & button { margin: 5px; } + height: ${dimensions.bottomBarHeight}px; ` export default ButtonBar diff --git a/administration/src/bp-modules/NavigationBar.tsx b/administration/src/bp-modules/NavigationBar.tsx index 67907484d..f14a762b4 100644 --- a/administration/src/bp-modules/NavigationBar.tsx +++ b/administration/src/bp-modules/NavigationBar.tsx @@ -7,11 +7,13 @@ import { WhoAmIContext } from '../WhoAmIProvider' import { Role } from '../generated/graphql' import { ProjectConfigContext } from '../project-configs/ProjectConfigContext' import UserMenu from './UserMenu' +import dimensions from './constants/dimensions' const PrintAwareNavbar = styled(Navbar)` @media print { display: none; } + height: ${dimensions.navigationBarHeight}; ` interface Props { diff --git a/administration/src/bp-modules/constants/dimensions.ts b/administration/src/bp-modules/constants/dimensions.ts new file mode 100644 index 000000000..6918cecd4 --- /dev/null +++ b/administration/src/bp-modules/constants/dimensions.ts @@ -0,0 +1,10 @@ +type DimensionsType = { + navigationBarHeight: number + bottomBarHeight: number +} + +const dimensions: DimensionsType = { + navigationBarHeight: 50, + bottomBarHeight: 70, +} +export default dimensions diff --git a/administration/src/bp-modules/stores/StoresTable.tsx b/administration/src/bp-modules/stores/StoresTable.tsx index 317149b82..4aa564585 100644 --- a/administration/src/bp-modules/stores/StoresTable.tsx +++ b/administration/src/bp-modules/stores/StoresTable.tsx @@ -4,13 +4,13 @@ import { useCallback } from 'react' import styled from 'styled-components' import { StoreFieldConfig } from '../../project-configs/getProjectConfig' +import dimensions from '../constants/dimensions' import { AcceptingStoreEntry } from './AcceptingStoreEntry' const TableContainer = styled.div` width: 100vw; - height: 85vh; + height: calc(100vh - ${dimensions.navigationBarHeight + dimensions.bottomBarHeight}px); display: flex; - align-self: center; ` const StyledCell = styled(Cell)` diff --git a/backend/src/main/kotlin/app/ehrenamtskarte/backend/stores/importer/nuernberg/steps/DownloadCsv.kt b/backend/src/main/kotlin/app/ehrenamtskarte/backend/stores/importer/nuernberg/steps/DownloadCsv.kt index 80bbcb4a1..4b7412acb 100644 --- a/backend/src/main/kotlin/app/ehrenamtskarte/backend/stores/importer/nuernberg/steps/DownloadCsv.kt +++ b/backend/src/main/kotlin/app/ehrenamtskarte/backend/stores/importer/nuernberg/steps/DownloadCsv.kt @@ -25,14 +25,14 @@ class DownloadCsv(config: ImportConfig, private val logger: Logger) : ) val parser = CSVFormat.RFC4180.builder().setHeader().setSkipHeaderRecord(true).build().parse(inputCSV) - return getCSVAcceptingStoreDeprecateds(parser) + return getCSVAcceptingStore(parser) } catch (e: Exception) { logger.error("Unknown exception while downloading data from csv", e) throw e } } - private fun getCSVAcceptingStoreDeprecateds(parser: CSVParser): List { + private fun getCSVAcceptingStore(parser: CSVParser): List { val stores: MutableList = arrayListOf() parser.records.forEach { record -> val name = record.get("Name")