more fixes

Tschonti · Sep 9, 2024 · d10c139 · d10c139
1 parent 2357f50
commit d10c139
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/packages/client/src/pages/events/EventDetails.page.tsx b/packages/client/src/pages/events/EventDetails.page.tsx
@@ -8,7 +8,7 @@ import { useStartRatingMutation } from 'src/api/hooks/ratingHooks'
 import { EventRatingStateBadge } from 'src/components/commons/EventRatingStateBadge'
 import { HelmetTitle } from 'src/components/commons/HelmetTitle'
 import { NavigateWithError } from 'src/components/commons/NavigateWithError'
-import { formatDateRange } from 'src/util/formatDateRange'
+import { formatDateRange } from 'src/util/dateHelpers'
 import { onError } from 'src/util/onError'
 import { useAuthContext } from '../../api/contexts/useAuthContext'
 import { useFetchEvent } from '../../api/hooks/eventQueryHooks'

diff --git a/packages/client/src/pages/events/components/EventListItem.tsx b/packages/client/src/pages/events/components/EventListItem.tsx
@@ -1,7 +1,7 @@
 import { Badge, Card, CardBody, CardHeader, Heading, HStack, Text } from '@chakra-ui/react'
 import { DbEvent, EventState, RatingStatus } from '@pontozo/common'
 import { Link } from 'react-router-dom'
-import { formatDateRange } from 'src/util/formatDateRange'
+import { formatDateRange } from 'src/util/dateHelpers'
 import { statusColor, translateStatus } from '../../../util/enumHelpers'
 import { PATHS } from '../../../util/paths'
 import { EventRankBadge } from './EventRankBadge'

diff --git a/packages/client/src/pages/ratings/components/DesktopRatingProgressBar.tsx b/packages/client/src/pages/ratings/components/DesktopRatingProgressBar.tsx
@@ -5,7 +5,7 @@ import { FaChevronLeft, FaChevronRight } from 'react-icons/fa'
 import { Link } from 'react-router-dom'
 import { useRatingContext } from 'src/api/contexts/useRatingContext'
 import { PContainer } from 'src/components/commons/PContainer'
-import { formatDateRange } from 'src/util/formatDateRange'
+import { formatDateRange } from 'src/util/dateHelpers'
 import { PATHS } from 'src/util/paths'
 import './progressBar.css'
 import { ProgressBarItem } from './ProgressBarItem'

diff --git a/packages/client/src/pages/results/ResultDetails.page.tsx b/packages/client/src/pages/results/ResultDetails.page.tsx
@@ -1,13 +1,13 @@
 import { FormLabel, Heading, HStack, Link as ChakraLink, Select, Stack, Text, VStack } from '@chakra-ui/react'
+import { ALL_ROLES } from '@pontozo/common'
 import { useEffect, useState } from 'react'
 import { useParams } from 'react-router-dom'
 import { useFetchEventResults } from 'src/api/hooks/resultHooks'
 import { HelmetTitle } from 'src/components/commons/HelmetTitle'
 import { LoadingSpinner } from 'src/components/commons/LoadingSpinner'
 import { NavigateWithError } from 'src/components/commons/NavigateWithError'
-import { formatDateRange } from 'src/util/formatDateRange'
+import { formatDateRange } from 'src/util/dateHelpers'
 import { PATHS } from 'src/util/paths'
-import { ALL_ROLES } from '../../../../common/src'
 import { EventRankBadge } from '../events/components/EventRankBadge'
 import { AgeGroupRoleSelector } from './components/AgeGroupRoleSelector'
 import { CategoryBarChart } from './components/CategoriesBarChart'

diff --git a/packages/client/src/pages/results/Results.page.tsx b/packages/client/src/pages/results/Results.page.tsx
@@ -1,4 +1,4 @@
-import { Checkbox, FormLabel, Heading, Select, Stack, VStack } from '@chakra-ui/react'
+import { Checkbox, FormLabel, Heading, Select, Stack, Text, VStack } from '@chakra-ui/react'
 import { ChangeEvent } from 'react'
 import { useResultTableContext } from 'src/api/contexts/useResultTableContext'
 import { HelmetTitle } from 'src/components/commons/HelmetTitle'
@@ -7,7 +7,8 @@ import { CriteriaDrawer } from './components/CriteriaDrawer'
 import { EventResultTable } from './components/table/EventResultTable'
 
 export const ResultsPage = () => {
-  const { selectedSeasonId, seasonsData, selectedSeasonChange, nationalOnly, setNationalOnly, sendResultRequest } = useResultTableContext()
+  const { selectedSeasonId, seasonsData, selectedSeasonChange, nationalOnly, setNationalOnly, sendResultRequest, sortedEvents } =
+    useResultTableContext()
 
   const nationalOnlyChange = (event: ChangeEvent) => {
     setNationalOnly(!nationalOnly)
@@ -38,7 +39,13 @@ export const ResultsPage = () => {
         {window.innerWidth < 768 ? <CriteriaDrawer isMobile /> : <CriteriaDrawer isMobile={false} />}
       </Stack>
 
-      <EventResultTable />
+      {sortedEvents.length ? (
+        <EventResultTable />
+      ) : (
+        <Text textAlign="center" fontStyle="italic">
+          Ebben a szezonban nincs a szűrőknek megfelelő versenyről eredmény.
+        </Text>
+      )}
     </>
   )
 }
diff --git a/packages/functions/src/functions/seasons/getAllAndOne.ts b/packages/functions/src/functions/seasons/getAllAndOne.ts
@@ -8,7 +8,7 @@ import { PontozoResponse } from '../../util/pontozoResponse'
 
 export const getAllAndOneSeasons = async (req: HttpRequest, context: InvocationContext): Promise<PontozoResponse<AllSeasonsAndOne>> => {
   try {
-    const now = new Date(2026, 3, 23)
+    const now = new Date()
     const seasonId = req.query.get('seasonId')
     const ads = await getAppDataSource(context)
     const seasonRepo = ads.getRepository(Season)