use dateRange function in my competitions and competition overview

thewca · Jan 10, 2025 · 4c06b25 · 4c06b25
1 parent 6bfbd85
commit 4c06b25
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/app/controllers/api/v0/competitions_controller.rb b/app/controllers/api/v0/competitions_controller.rb
@@ -25,7 +25,7 @@ def competition_index
 
     competitions = competitions_scope.search(params[:q], params: params)
 
-    serial_methods = ["short_display_name", "city", "country_iso2", "event_ids", "date_range", "latitude_degrees", "longitude_degrees"]
+    serial_methods = ["short_display_name", "city", "country_iso2", "event_ids", "latitude_degrees", "longitude_degrees"]
     serial_includes = {}
 
     serial_includes["delegates"] = { only: ["id", "name"], methods: [], include: ["avatar"] } if admin_mode

diff --git a/app/views/competitions/my_competitions.html.erb b/app/views/competitions/my_competitions.html.erb
@@ -1,8 +1,8 @@
 <% provide(:title, t('.title')) %>
 
 <% options = {
-  only: %w[id name website start_date end_date, registration_open],
-  methods: %w[url city country_iso2 registration_status results_posted? visible? confirmed? cancelled? report_posted? date_range short_display_name],
+  only: %w[id name website start_date end_date registration_open],
+  methods: %w[url city country_iso2 registration_status results_posted? visible? confirmed? cancelled? report_posted? short_display_name],
   include: %w[championships],
 } %>
 

diff --git a/app/webpacker/components/CompetitionsOverview/ListViewSection.js b/app/webpacker/components/CompetitionsOverview/ListViewSection.js
@@ -21,6 +21,7 @@ import {
 } from '../../lib/utils/competition-table';
 import { countries } from '../../lib/wca-data.js.erb';
 import { adminCompetitionUrl, competitionUrl } from '../../lib/requests/routes.js.erb';
+import { dateRange } from '../../lib/utils/dates';
 
 function ListViewSection({
   competitions,
@@ -154,7 +155,7 @@ export function CompetitionsTable({
                 />
               </Table.Cell>
               <Table.Cell textAlign="right" width={2}>
-                {comp.date_range}
+                {dateRange(comp.start_date, comp.end_date)}
               </Table.Cell>
               <Table.Cell width={5}>
                 <Flag name={comp.country_iso2?.toLowerCase()} />
@@ -210,7 +211,7 @@ export function CompetitionsTabletTable({
                 />
               </Table.Cell>
               <Table.Cell textAlign="right" width={3}>
-                {comp.date_range}
+                {dateRange(comp.start_date, comp.end_date)}
               </Table.Cell>
               <Table.Cell width={6}>
                 <Flag name={comp.country_iso2?.toLowerCase()} />
@@ -257,7 +258,7 @@ export function CompetitionsMobileTable({
                     isSortedByAnnouncement={isSortedByAnnouncement}
                     regStatusLoading={regStatusLoading}
                   />
-                  {comp.date_range}
+                  {dateRange(comp.start_date, comp.end_date)}
                 </Label>
                 <Flag name={comp.country_iso2?.toLowerCase()} />
                 <a href={competitionUrl(comp.id)}>{comp.short_display_name}</a>
@@ -360,7 +361,7 @@ function AdminCompetitionsTable({
                   </List>
                 </Table.Cell>
                 <Table.Cell textAlign="center" width={3}>
-                  {comp.date_range}
+                  {dateRange(comp.start_date, comp.end_date)}
                 </Table.Cell>
                 <Table.Cell
                   textAlign="center"

diff --git a/app/webpacker/components/CompetitionsOverview/MapView.js b/app/webpacker/components/CompetitionsOverview/MapView.js
@@ -11,6 +11,7 @@ import ResizeMapIFrame from '../../lib/utils/leaflet-iframe';
 import 'leaflet/dist/leaflet.css';
 import { isProbablyOver } from '../../lib/utils/competition-table';
 import { competitionUrl } from '../../lib/requests/routes.js.erb';
+import { dateRange } from '../../lib/utils/dates';
 
 // Limit number of markers on map, especially for "All Past Competitions"
 const MAP_DISPLAY_LIMIT = 500;
@@ -53,7 +54,7 @@ function MapView({
             <Popup>
               <a href={competitionUrl(comp.id)}>{comp.name}</a>
               <br />
-              {`${comp.date_range} - ${comp.city}`}
+              {`${dateRange(comp.start_date, comp.end_date)} - ${comp.city}`}
             </Popup>
           </Marker>
         ))}

diff --git a/app/webpacker/components/MyCompetitions/TableCells.jsx b/app/webpacker/components/MyCompetitions/TableCells.jsx
@@ -3,6 +3,7 @@ import React from 'react';
 import I18n from '../../lib/i18n';
 import { competitionReportUrl, competitionReportEditUrl } from '../../lib/requests/routes.js.erb';
 import { countries } from '../../lib/wca-data.js.erb';
+import { dateRange } from '../../lib/utils/dates';
 
 export function NameTableCell({ competition }) {
   return (
@@ -26,9 +27,10 @@ export function LocationTableCell({ competition }) {
 }
 
 export function DateTableCell({ competition }) {
+  console.log(competition);
   return (
     <Table.Cell>
-      {competition.date_range}
+      {dateRange(competition.start_date, competition.end_date, { separator: '-' })}
     </Table.Cell>
   );
 }