Apply changes from code review

indico · Apr 24, 2023 · e75d5b1 · e75d5b1
1 parent 9fc98ca
commit e75d5b1
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -23,6 +23,8 @@ Improvements
 - Add support for authorized submitters in Call for Papers (:pr:`5728`)
 - Display abstract submission comment in the list of abstracts (:pr:`5733`)
 - Allow searching for contributions by author in the management area (:pr:`5742`)
+- Add day of the week to room booking details modal and timeline (:issue:`5718`,
+  :pr:`5743`)
 
 Bugfixes
 ^^^^^^^^

diff --git a/indico/modules/rb/client/js/common/bookings/BookingDetails.jsx b/indico/modules/rb/client/js/common/bookings/BookingDetails.jsx
@@ -292,7 +292,7 @@ class BookingDetails extends React.Component {
         rejections: rejections[day] || [],
         other: other[day] || [],
       },
-      label: moment(day).format('(ddd.) L'),
+      label: moment(day).format('ddd. L'),
       key: day,
       room,
     });

diff --git a/indico/modules/rb/client/js/components/TimeInformation.jsx b/indico/modules/rb/client/js/components/TimeInformation.jsx
@@ -50,14 +50,24 @@ function TimeInformation({
             {mEndDate && !mStartDate.isSame(mEndDate, 'day') ? (
               <Translate>
                 <Param
-                  name="startDate"
-                  wrapper={<strong />}
-                  value={mStartDate.format('(ddd.) L')}
+                  name="startDateDay"
+                  wrapper={<span styleName="booking-times-weekday" />}
+                  value={mStartDate.format('ddd.')}
                 />{' '}
-                <Param name="endDate" wrapper={<strong />} value={mEndDate.format('(ddd.) L')} />
+                <Param name="startDate" wrapper={<strong />} value={mStartDate.format('L')} />
+                {' — '}
+                <Param
+                  name="endDateDay"
+                  wrapper={<span styleName="booking-times-weekday" />}
+                  value={mEndDate.format('ddd.')}
+                />{' '}
+                <Param name="endDate" wrapper={<strong />} value={mEndDate.format('L')} />
               </Translate>
             ) : (
-              <strong>{mStartDate.format('(dddd.) L')}</strong>
+              <strong>
+                <span styleName="booking-times-weekday">{mStartDate.format('ddd.')}</span>{' '}
+                {mStartDate.format('L')}
+              </strong>
             )}
           </div>
         </Segment>

diff --git a/indico/modules/rb/client/js/components/TimeInformation.module.scss b/indico/modules/rb/client/js/components/TimeInformation.module.scss
@@ -5,6 +5,8 @@
 // modify it under the terms of the MIT License; see the
 // LICENSE file for more details.
 
+@import 'rb:styles/palette';
+
 .booking-time-info {
   margin-top: 10px;
 }
@@ -14,3 +16,8 @@
   justify-content: space-between;
   align-items: center;
 }
+
+.booking-times-weekday {
+  color: $booking-details-dates-weekday-color;
+  font-weight: bold;
+}
diff --git a/indico/modules/rb/client/styles/palette.scss b/indico/modules/rb/client/styles/palette.scss
@@ -47,6 +47,7 @@ $pending-cancellation-fadeout-colors: $pending-cancellation-color,
   lighten($pending-cancellation-color, 30%);
 $rejection-fadeout-colors: $rejection-color, lighten($rejection-color, 30%);
 $other-booking-fadeout-colors: $other-booking-color, lighten($other-booking-color, 30%);
+$booking-details-dates-weekday-color: #8f8f8f;
 
 %rb-splash-background {
   background-image: url('static:images/globe.png');