fix: changed conditions for date range in header subtitle for ct event (

#825) * fix: changed conditions for date range in header subtitle for ct event * fix: managed terminates after x occurrences --------- Co-authored-by: Piero Nicolli <[email protected]>
RedTurtle · Dec 19, 2024 · bfc673d · bfc673d
1 parent ac69380
commit bfc673d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 12 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -41,6 +41,20 @@
 - ...
  -->
 
+## Versione X.X.X (dd/mm/yyyy)
+
+### Migliorie
+
+- Il sottotitolo del CT Evento mostra il range di date per tutti gli eventi con ricorrenza o con una data di fine diversa dalla data di inizio.
+
+### Novità
+
+- ...
+
+### Fix
+
+- La pagina non dà più errore quando si imposta una ricorrenza con impostazione "Termina dopo tot. ricorrenze".
+
 ## Versione 11.25.3 (12/12/2024)
 
 ### Migliorie

diff --git a/src/components/ItaliaTheme/View/Commons/Dates.jsx b/src/components/ItaliaTheme/View/Commons/Dates.jsx
@@ -85,6 +85,7 @@ const Dates = ({ content, show_image, moment: momentlib, rrule }) => {
   const start = viewDate(intl.locale, content.start);
   // format and save date into new variable depending on recurrence of event
   const end = viewDate(intl.locale, actualEndDate);
+
   const openEnd = content?.open_end;
   const wholeDay = content?.whole_day;
   const rdates = rruleSet?.rdates() ?? [];
@@ -133,11 +134,11 @@ const Dates = ({ content, show_image, moment: momentlib, rrule }) => {
           <div className="point-list">
             <div className="point-list-aside point-list-warning">
               <span className="point-date font-monospace">
-                {end.format('DD')}
+                {end?.format('DD')}
               </span>
-              <span className="point-month">{end.format('MMMM')}</span>
-              {!end.isSame(start, 'year') && (
-                <span className="point-month">{end.format('YYYY')}</span>
+              <span className="point-month">{end?.format('MMMM')}</span>
+              {!end?.isSame(start, 'year') && (
+                <span className="point-month">{end?.format('YYYY')}</span>
               )}
             </div>
             <div className="point-list-content">
@@ -148,7 +149,7 @@ const Dates = ({ content, show_image, moment: momentlib, rrule }) => {
               >
                 <CardBody tag="div" className={'card-body'}>
                   <CardTitle tag="p">
-                    {!content.whole_day && `${end.format('HH:mm')} - `}
+                    {!content.whole_day && `${end?.format('HH:mm')} - `}
                     {intl.formatMessage(messages.end)}
                   </CardTitle>
                 </CardBody>

diff --git a/src/components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates.jsx b/src/components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates.jsx
@@ -36,26 +36,31 @@ const PageHeaderEventDates = ({ content, moment, rrule }) => {
 
   const actualEndDate = getRealEventEnd(content, rruleSet);
 
-  const wholeDay = content?.whole_day;
+  // const wholeDay = content?.whole_day;
   const openEnd = content?.open_end;
   // show only start when event starts and ends in same day or if a recurrence is set
   // because to set a recurrence, the event must have the same date as start and end date
   const renderOnlyStart =
     Moment(content.end).format('DD-MM-Y') ===
-      Moment(content.start).format('DD-MM-Y') && !content.recurrence;
+    Moment(content.start).format('DD-MM-Y');
+
   let eventRecurrenceText = null;
 
   if (content['@type'] === 'Event') {
     if (content.recurrence) {
       const isRecurrenceByDay = content.recurrence.includes('BYDAY=+');
+      const isRecurrenceByMonthDay = content.recurrence.includes('BYMONTHDAY=');
       const isWeekdaySunday = content.recurrence
         .split('BYDAY')[1]
         ?.includes('SU');
 
       const RRULE_LANGUAGE = rrulei18n(intl, Moment);
       eventRecurrenceText = rruleSet.rrules()[0]?.toText(
         (t) => {
-          if (Moment.locale(intl.locale) === 'it' && isRecurrenceByDay) {
+          if (
+            Moment.locale(intl.locale) === 'it' &&
+            (isRecurrenceByDay || isRecurrenceByMonthDay)
+          ) {
             RRULE_LANGUAGE.strings.th = '°';
             RRULE_LANGUAGE.strings.nd = '°';
             RRULE_LANGUAGE.strings.rd = '°';
@@ -79,11 +84,11 @@ const PageHeaderEventDates = ({ content, moment, rrule }) => {
 
   return content['@type'] === 'Event' ? (
     <p className="h4 py-2">
-      {!Moment(content.end).isSame(actualEndDate) &&
+      {(content.recurrence || !renderOnlyStart) &&
         !openEnd &&
-        !renderOnlyStart &&
         `dal ${Moment(content.start).format('DD-MM-Y')} al ${endDate}`}
-      {(renderOnlyStart || Moment(content.end).isSame(actualEndDate)) &&
+      {!content.recurrence &&
+        renderOnlyStart &&
         !openEnd &&
         `${Moment(content.start).format('DD-MM-Y')}`}
       {openEnd &&

diff --git a/src/helpers/dates.js b/src/helpers/dates.js
@@ -48,7 +48,8 @@ export const getRealStartAndEndWithRecurrence = (
 
 export const getRealEventEnd = (content, rruleSet) => {
   let actualEndDate = content.end;
-  if (content.recurrence) {
+
+  if (content.recurrence && rruleSet.rrules()[0].options.until) {
     actualEndDate = rruleSet.rrules()[0].options.until;
   }
   return actualEndDate;