#3024: Add all day indicators to calendars, maps etc

NCI-Agency · Oct 12, 2020 · 5af227c · 5af227c
1 parent 673b781
commit 5af227c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/client/src/components/ReportSummary.js b/client/src/components/ReportSummary.js
@@ -251,9 +251,7 @@ const ReportSummaryRow = ({ report }) => {
         <Col md={12}>
           {report.engagementDate && (
             <Label bsStyle="default" className="engagement-date">
-              {moment(report.engagementDate).format(
-                Report.getEngagementDateFormat()
-              )}
+              {Report.getFormattedEngagementDate(report)}
             </Label>
           )}
         </Col>

diff --git a/client/src/components/aggregations/ReportsMapWidget.js b/client/src/components/aggregations/ReportsMapWidget.js
@@ -5,7 +5,7 @@ import {
 import Leaflet from "components/Leaflet"
 import _escape from "lodash/escape"
 import _isEmpty from "lodash/isEmpty"
-import { Location } from "models"
+import { Location, Report } from "models"
 import PropTypes from "prop-types"
 import React, { useMemo } from "react"
 
@@ -25,7 +25,9 @@ const ReportsMapWidget = ({
     values.forEach(report => {
       if (Location.hasCoordinates(report.location)) {
         let label = _escape(report.intent || "<undefined>") // escape HTML in intent!
-        label += `<br/>@ <b>${_escape(report.location.name)}</b>` // escape HTML in locationName!
+        label += `<br/>@ <b>${_escape(
+          report.location.name
+        )} ${Report.getAllDayIndicator(report)}</b>` // escape HTML in locationName!
         markerArray.push({
           id: report.uuid,
           lat: report.location.lat,

diff --git a/client/src/components/aggregations/utils.js b/client/src/components/aggregations/utils.js
@@ -208,7 +208,9 @@ export function reportsToEvents(reports) {
       (r.location && r.location.name) ||
       ""
     return {
-      title: who + "@" + where,
+      title: `${who} @ ${where} - ${
+        Report.isEngagementAllDay(r) ? "(all day)" : ""
+      }`,
       start: moment(r.engagementDate).format("YYYY-MM-DD HH:mm"),
       end: moment(r.engagementDate)
         .add(r.duration, "minutes")

diff --git a/client/src/models/Report.js b/client/src/models/Report.js
@@ -423,6 +423,14 @@ export default class Report extends Model {
     return attendees.find(el => el.role === role && el.primary)
   }
 
+  static isEngagementAllDay(report) {
+    return !report.duration
+  }
+
+  static getAllDayIndicator(report) {
+    return Report.isEngagementAllDay(report) ? "(all day)" : ""
+  }
+
   static getEngagementDateFormat() {
     return Settings.engagementsIncludeTimeAndDuration
       ? Settings.dateFormats.forms.displayLong.withTime
@@ -535,7 +543,7 @@ export default class Report extends Model {
     }
 
     const start = moment(report.engagementDate)
-    if (!report.duration) {
+    if (Report.isEngagementAllDay(report)) {
       return Settings.engagementsIncludeTimeAndDuration
         ? start.format(Settings.dateFormats.forms.displayLong.date) +
             " (all day)"

diff --git a/client/src/pages/reports/Show.js b/client/src/pages/reports/Show.js
@@ -530,10 +530,7 @@ const ReportShow = ({ setSearchQuery, pageDispatchers }) => {
                   component={FieldHelper.ReadonlyField}
                   humanValue={
                     <>
-                      {report.engagementDate &&
-                        moment(report.engagementDate).format(
-                          Report.getEngagementDateFormat()
-                        )}
+                      {Report.getFormattedEngagementDate(report)}
                       <PlanningConflictForReport report={report} largeIcon />
                     </>
                   }