better fix

idaholab · Jan 11, 2023 · 575ebdf · 575ebdf
1 parent 0e70b3c
commit 575ebdf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/AdminWebApp/src/translations.ts b/AdminWebApp/src/translations.ts
@@ -105,7 +105,7 @@ export default {
             containerExport: 'Export Container',
             containerExportDescription: 'Export Container to File',
             containerImport: 'Import Container',
-            containerImportDescription: 'Import Container from File'
+            containerImportDescription: 'Import Container from File',
         },
         containerExport: {
             pageTitle: 'Export Container to File',
@@ -119,8 +119,7 @@ export default {
         },
         containerImport: {
             pageTitle: 'Import Container from File',
-            pageDescription:
-                "Use this page to import your container and it's various parts from a file that was generated by a previous container export.",
+            pageDescription: "Use this page to import your container and it's various parts from a file that was generated by a previous container export.",
             importOntology: 'Ontology',
             importOntologyHelp: 'Imports a new ontology from the supplied container file.',
             importDataSources: 'Data Sources',
@@ -983,7 +982,7 @@ export default {
             resultingTypes: 'Metatype/Metatype Relationship/Name',
             requiredField: 'Required Field',
             dateFormatString: 'Date Format String(blank for ISO)',
-            dateFormatStringHelp: 'Formatting your date/time',
+            dateFormatStringHelp: 'Formatting your date/time - if you do not include a timezone, we will assume UTC time.',
             selectNodeID: 'Target Node',
             selectNodeIDHelp: 'These fields allow you to select which node this time series data should be attached to.',
             nodeIDKey: 'Node ID Key',

diff --git a/src/domain_objects/data_warehouse/etl/type_transformation.ts b/src/domain_objects/data_warehouse/etl/type_transformation.ts
@@ -988,12 +988,13 @@ export default class TypeTransformation extends BaseDomainClass {
                 // if it's a number we assume we're dealing with unix time
                 if (typeof value === 'number') {
                     try {
-                        const convertedDate = date_conversion_format
-                            ? new Date(
-                                  (parse(value.toString(), date_conversion_format, new Date()) as any) -
-                                      parse(value.toString(), date_conversion_format, new Date()).getTimezoneOffset() * 60 * 1000,
-                              )
-                            : new Date(value);
+                        let convertedDate = date_conversion_format ? parse(value.toString(), date_conversion_format, new Date()) : new Date(value);
+
+                        convertedDate =
+                            date_conversion_format?.includes('x') || date_conversion_format?.includes('X')
+                                ? convertedDate
+                                : new Date((convertedDate as any) - convertedDate.getTimezoneOffset() * 60 * 1000);
+
                         return new Conversion({original_value: value, converted_value: convertedDate.toISOString()});
                     } catch (e) {
                         return new Conversion({original_value: value, errors: `unable to convert value to date using format string: ${e}`});
@@ -1002,12 +1003,13 @@ export default class TypeTransformation extends BaseDomainClass {
 
                 if (typeof value === 'string') {
                     try {
-                        const convertedDate = date_conversion_format
-                            ? new Date(
-                                  (parse(value, date_conversion_format, new Date()) as any) -
-                                      parse(value, date_conversion_format, new Date()).getTimezoneOffset() * 60 * 1000,
-                              )
-                            : new Date(value);
+                        let convertedDate = date_conversion_format ? parse(value, date_conversion_format, new Date()) : new Date(value);
+
+                        convertedDate =
+                            date_conversion_format?.includes('x') || date_conversion_format?.includes('X')
+                                ? convertedDate
+                                : new Date((convertedDate as any) - convertedDate.getTimezoneOffset() * 60 * 1000);
+
                         return new Conversion({original_value: value, converted_value: convertedDate.toISOString()});
                     } catch (e) {
                         return new Conversion({original_value: value, errors: `unable to convert value to date using format string: ${e}`});