FIO-5750: Fixing timezones in emails.

Author: travist

src/components/_classes/component/Component.js

@@ -8,7 +8,7 @@ import { GlobalFormio as Formio } from '../../../Formio';
 import * as FormioUtils from '../../../utils/utils';
 import Validator from '../../../validator/Validator';
 import {
-  fastCloneDeep, boolValue, getComponentPath, isInsideScopingComponent,
+  fastCloneDeep, boolValue, getComponentPath, isInsideScopingComponent, currentTimezone
 } from '../../../utils/utils';
 import Element from '../../../Element';
 import ComponentModal from '../componentModal/ComponentModal';
@@ -1031,6 +1031,28 @@ export default class Component extends Element {
     return this.options.submissionTimezone;
   }
 
+  get timezone() {
+    if (this.component.timezone) {
+      return this.component.timezone;
+    }
+    if (this.component.displayInTimezone === 'utc') {
+      return 'UTC';
+    }
+    const submissionTimezone = this.submissionTimezone;
+    if (
+      submissionTimezone &&
+      (
+        (this.component.displayInTimezone === 'submission') ||
+        ((this.options.pdf || this.options.server) && (this.component.displayInTimezone === 'viewer'))
+      )
+    ) {
+      return submissionTimezone;
+    }
+
+    // Return current timezone if none are provided.
+    return currentTimezone();
+  }
+
   loadRefs(element, refs) {
     for (const ref in refs) {
       const refType = refs[ref];

src/components/datetime/DateTime.js

@@ -168,10 +168,12 @@ export default class DateTimeComponent extends Input {
   }
 
   getValueAsString(value) {
-    const format = FormioUtils.convertFormatToMoment(this.component.format);
-    if (value && !this.attached && this.submissionTimezone) {
-      return FormioUtils.momentDate(value, format, this.submissionTimezone).format(format);
+    let format = FormioUtils.convertFormatToMoment(this.component.format);
+    format += format.match(/z$/) ? '' : ' z';
+    const timezone = this.timezone;
+    if (value && !this.attached && timezone) {
+      return _.trim(FormioUtils.momentDate(value, format, timezone).format(format));
     }
-    return (value ? moment(value).format(format) : value) || '';
+    return (value ? _.trim(moment(value).format(format)) : value) || '';
   }
 }

src/widgets/CalendarWidget.js

@@ -4,7 +4,6 @@ import {
   convertFormatToFlatpickr,
   convertFormatToMask,
   convertFormatToMoment,
-  currentTimezone,
   formatDate,
   formatOffset,
   getBrowserInfo,
@@ -228,23 +227,8 @@ export default class CalendarWidget extends InputWidget {
     });
   }
 
-  defineTimezone() {
-    if (this.settings.timezone) {
-      return this.settings.timezone;
-    }
-    if (this.settings.displayInTimezone === 'submission') {
-      return this.componentInstance.submissionTimezone;
-    }
-    if (this.settings.displayInTimezone === 'utc') {
-      return 'UTC';
-    }
-
-    // Return current timezone if none are provided.
-    return currentTimezone();
-  }
-
   get timezone() {
-    return this.defineTimezone();
+    return this.componentInstance.timezone;
   }
 
   get defaultSettings() {