@qrvey/utils 1.2.9-24 → 1.2.9-25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -27,14 +27,15 @@ exports.transformValue = transformValue;
27
27
  */
28
28
  function getOutputFormat(settings) {
29
29
  let type, format;
30
- if ((0, isDateColumn_1.isDateColumn)(settings.column) && [DATE_GROUPING_PROPERTY_1.DATE_GROUPING_PROPERTY.DAY, DATE_GROUPING_TIME_PROPERTY_1.DATE_GROUPING_TIME_PROPERTY.HOUR, DATE_GROUPING_TIME_PROPERTY_1.DATE_GROUPING_TIME_PROPERTY.MINUTE, DATE_GROUPING_TIME_PROPERTY_1.DATE_GROUPING_TIME_PROPERTY.SECOND].includes(settings.property)) {
30
+ const isDateTime = [DATE_GROUPING_TIME_PROPERTY_1.DATE_GROUPING_TIME_PROPERTY.HOUR, DATE_GROUPING_TIME_PROPERTY_1.DATE_GROUPING_TIME_PROPERTY.MINUTE, DATE_GROUPING_TIME_PROPERTY_1.DATE_GROUPING_TIME_PROPERTY.SECOND].includes(settings.property);
31
+ if ((0, isDateColumn_1.isDateColumn)(settings.column) && [DATE_GROUPING_PROPERTY_1.DATE_GROUPING_PROPERTY.DAY].includes(settings.property) && isDateTime) {
31
32
  type = 'DATE';
32
33
  format = 'Default';
33
34
  }
34
35
  else if ((0, isNumericalColumn_1.isNumericalColumn)(settings.column)) {
35
36
  type = 'NUMERIC';
36
37
  }
37
- return { type, format };
38
+ return { type, format, originalFormat: isDateTime ? settings.column.outputFormat : undefined };
38
39
  }
39
40
  /**
40
41
  * Gets the format config
@@ -23,14 +23,15 @@ export function transformValue(value, settings) {
23
23
  */
24
24
  function getOutputFormat(settings) {
25
25
  let type, format;
26
- if (isDateColumn(settings.column) && [DATE_GROUPING_PROPERTY.DAY, DATE_GROUPING_TIME_PROPERTY.HOUR, DATE_GROUPING_TIME_PROPERTY.MINUTE, DATE_GROUPING_TIME_PROPERTY.SECOND].includes(settings.property)) {
26
+ const isDateTime = [DATE_GROUPING_TIME_PROPERTY.HOUR, DATE_GROUPING_TIME_PROPERTY.MINUTE, DATE_GROUPING_TIME_PROPERTY.SECOND].includes(settings.property);
27
+ if (isDateColumn(settings.column) && [DATE_GROUPING_PROPERTY.DAY].includes(settings.property) && isDateTime) {
27
28
  type = 'DATE';
28
29
  format = 'Default';
29
30
  }
30
31
  else if (isNumericalColumn(settings.column)) {
31
32
  type = 'NUMERIC';
32
33
  }
33
- return { type, format };
34
+ return { type, format, originalFormat: isDateTime ? settings.column.outputFormat : undefined };
34
35
  }
35
36
  /**
36
37
  * Gets the format config
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qrvey/utils",
3
- "version": "1.2.9-24",
3
+ "version": "1.2.9-25",
4
4
  "description": "Helper, Utils for all Qrvey Projects",
5
5
  "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
6
6
  "main": "dist/index.js",
@@ -28,13 +28,14 @@ export function transformValue(value: string, settings: ITransformValueSettings)
28
28
  */
29
29
  function getOutputFormat(settings: ITransformValueSettings) {
30
30
  let type, format;
31
- if (isDateColumn(settings.column) && [DATE_GROUPING_PROPERTY.DAY, DATE_GROUPING_TIME_PROPERTY.HOUR, DATE_GROUPING_TIME_PROPERTY.MINUTE, DATE_GROUPING_TIME_PROPERTY.SECOND].includes(settings.property as any)) {
31
+ const isDateTime = [DATE_GROUPING_TIME_PROPERTY.HOUR, DATE_GROUPING_TIME_PROPERTY.MINUTE, DATE_GROUPING_TIME_PROPERTY.SECOND].includes(settings.property as any);
32
+ if (isDateColumn(settings.column) && [DATE_GROUPING_PROPERTY.DAY].includes(settings.property as any) && isDateTime) {
32
33
  type = 'DATE';
33
34
  format = 'Default';
34
35
  } else if (isNumericalColumn(settings.column)) {
35
36
  type = 'NUMERIC';
36
37
  }
37
- return { type, format };
38
+ return { type, format, originalFormat: isDateTime ? settings.column.outputFormat : undefined };
38
39
  }
39
40
 
40
41
  /**