@qrvey/utils 1.4.0-6 → 1.4.0-7

package/README.md

@@ -1,4 +1,4 @@
-# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.4.0-6*
+# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.4.0-7*
 
 > Helper, Utils for all Qrvey Projects
 

package/dist/cjs/column_format/helpers/defineTableChartFormat.js

@@ -1,59 +1,64 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineTableChartFormat = void 0;
-const __1 = require("../..");
+const AGGREGATE_1 = require("../../charts/constants/AGGREGATE");
+const COLUMN_1 = require("../../columns/constants/COLUMN");
+const isEmpty_1 = require("../../general/mix/isEmpty");
 const CHART_GROUP_1 = require("../constants/CHART_GROUP");
-const DATEGROUP_UNSUPPORT_FORMAT_1 = require("../constants/DATEGROUP_UNSUPPORT_FORMAT");
 const STRING_FORMAT_1 = require("../constants/STRING_FORMAT");
 const TABLE_TYPE_1 = require("../constants/TABLE_TYPE");
 const columnTypeByChart_1 = require("./columnTypeByChart");
+const CALCULATION_LABEL_1 = require("../../qrvey/constants/CALCULATION_LABEL");
 /**
  * It returns the format of a column based on the column type, the chart type, and the chart settings
  * @param {IChartColumn} column - IChartColumn
  * @param {IColumnFormatSettings} settings - IColumnFormatSettings
  */
 const defineTableChartFormat = (column, settings) => {
-    const { aggregate, defaultFormat, outputFormat, selectedFormat, dateGroup } = column;
+    const { aggregate, defaultFormat, outputFormat, selectedFormat, calculation, } = column;
     const { tableType, shelfType } = settings;
     //Defaults
     const defaultText = "Default";
-    const defaultNumeric = { type: "NUMERIC", format: "Numeric" };
+    const defaultNumeric = { type: "NUMERIC", format: "Decimal" /* LOCALE_FORMATS.DECIMAL */ };
+    const defaultPercentage = {
+        type: "NUMERIC",
+        format: "Percentage" /* LOCALE_FORMATS.PERCENTAGE */,
+    };
     const isGroupedTable = tableType === TABLE_TYPE_1.TABLE_TYPE.GROUPED;
     const columnType = (0, columnTypeByChart_1.columnTypeByChart)(column, shelfType, CHART_GROUP_1.CHART_GROUPS.TABLES, isGroupedTable);
-    const noFormatSupported = DATEGROUP_UNSUPPORT_FORMAT_1.DATEGROUP_UNSUPPORT_FORMAT.some((gp) => gp === (dateGroup === null || dateGroup === void 0 ? void 0 : dateGroup.label));
-    const hasDefaultFormat = (0, __1.isEmpty)(selectedFormat) ||
+    const hasDefaultFormat = (0, isEmpty_1.isEmpty)(selectedFormat) ||
         (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === defaultText ||
         (selectedFormat === null || selectedFormat === void 0 ? void 0 : selectedFormat.format) === defaultText;
     switch (columnType) {
-        case __1.COLUMN.YES_NO:
-        case __1.COLUMN.PHONE:
-        case __1.COLUMN.SINGLE_CHOICE:
-        case __1.COLUMN.LONGTEXT:
-        case __1.COLUMN.DROPDOWN:
-        case __1.COLUMN.EXPRESSION:
-        case __1.COLUMN.NAME:
-        case __1.COLUMN.EMAIL_FORM:
-        case __1.COLUMN.IMAGE:
-        case __1.COLUMN.TEXT_LABEL:
+        case COLUMN_1.COLUMN.YES_NO:
+        case COLUMN_1.COLUMN.PHONE:
+        case COLUMN_1.COLUMN.SINGLE_CHOICE:
+        case COLUMN_1.COLUMN.LONGTEXT:
+        case COLUMN_1.COLUMN.DROPDOWN:
+        case COLUMN_1.COLUMN.EXPRESSION:
+        case COLUMN_1.COLUMN.NAME:
+        case COLUMN_1.COLUMN.EMAIL_FORM:
+        case COLUMN_1.COLUMN.IMAGE:
+        case COLUMN_1.COLUMN.TEXT_LABEL:
             return STRING_FORMAT_1.STRING_FORMAT.NONE;
-        case __1.COLUMN.DATE: {
-            if (noFormatSupported) {
-                return STRING_FORMAT_1.STRING_FORMAT.NONE;
-            }
-            else if (hasDefaultFormat) {
-                const columnDefaultFormat = defaultFormat || outputFormat || { type: 'DATE', format: 'MM/DD/YYYY' };
+        case COLUMN_1.COLUMN.DATE: {
+            if (hasDefaultFormat) {
+                const columnDefaultFormat = defaultFormat ||
+                    outputFormat || { type: "DATE", format: "MM/DD/YYYY" };
                 return Object.assign(Object.assign({}, defaultFormat), { format: defaultText, originalFormat: Object.assign({}, columnDefaultFormat), type: "DATE" });
             }
             else {
                 return selectedFormat;
             }
         }
-        case __1.COLUMN.NUMERIC:
-        case __1.COLUMN.RATING:
-        case __1.COLUMN.SLIDEBAR: {
+        case COLUMN_1.COLUMN.NUMERIC:
+        case COLUMN_1.COLUMN.RATING:
+        case COLUMN_1.COLUMN.SLIDEBAR: {
+            if ((calculation === null || calculation === void 0 ? void 0 : calculation.value) === CALCULATION_LABEL_1.CALCULATION_LABEL.PDIFF)
+                return defaultPercentage;
             if (hasDefaultFormat) {
-                if ((aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === __1.AGGREGATE.COUNT ||
-                    (aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === __1.AGGREGATE.DISTINCTCOUNT)
+                if ((aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE_1.AGGREGATE.COUNT ||
+                    (aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE_1.AGGREGATE.DISTINCTCOUNT)
                     return defaultNumeric;
                 return defaultFormat || defaultNumeric;
             }

package/dist/cjs/column_format/helpers/defineXYChartFormat.js

@@ -4,6 +4,7 @@ exports.defineXYChartFormat = void 0;
 const AGGREGATE_1 = require("../../charts/constants/AGGREGATE");
 const COLUMN_1 = require("../../columns/constants/COLUMN");
 const isEmpty_1 = require("../../general/mix/isEmpty");
+const CALCULATION_LABEL_1 = require("../../qrvey/constants/CALCULATION_LABEL");
 const CHART_GROUP_1 = require("../constants/CHART_GROUP");
 const DATEGROUP_UNSUPPORT_FORMAT_1 = require("../constants/DATEGROUP_UNSUPPORT_FORMAT");
 const STRING_FORMAT_1 = require("../constants/STRING_FORMAT");
@@ -16,13 +17,17 @@ const columnTypeByChart_1 = require("./columnTypeByChart");
  * @param {IColumnFormatSettings} settings - IColumnFormatSettings
  */
 const defineXYChartFormat = (column, settings) => {
-    const { aggregate, type, defaultFormat, outputFormat, selectedFormat, dateGroup, } = column;
+    const { aggregate, type, defaultFormat, outputFormat, selectedFormat, dateGroup, calculation, } = column;
     const { shelfType, withoutFormat } = settings;
     const columnDefaultFormat = defaultFormat || outputFormat;
     //Defaults
     const defaultText = "Default";
     const defaultAbb = { type: "NUMERIC", format: "Abbreviated" /* LOCALE_FORMATS.ABBREVIATED */ };
     const defaultDecimal = { type: "NUMERIC", format: "Decimal" /* LOCALE_FORMATS.DECIMAL */ };
+    const defaultPercentage = {
+        type: "NUMERIC",
+        format: "Percentage" /* LOCALE_FORMATS.PERCENTAGE */,
+    };
     const columnType = (0, columnTypeByChart_1.columnTypeByChart)(column, shelfType, CHART_GROUP_1.CHART_GROUPS.XY);
     const noFormatSupported = DATEGROUP_UNSUPPORT_FORMAT_1.DATEGROUP_UNSUPPORT_FORMAT.some((gp) => gp === (dateGroup === null || dateGroup === void 0 ? void 0 : dateGroup.label));
     const isUsedAsNumericColumn = type !== columnType;
@@ -58,6 +63,8 @@ const defineXYChartFormat = (column, settings) => {
         case COLUMN_1.COLUMN.NUMERIC:
         case COLUMN_1.COLUMN.RATING:
         case COLUMN_1.COLUMN.SLIDEBAR: {
+            if ((calculation === null || calculation === void 0 ? void 0 : calculation.aggregate) === CALCULATION_LABEL_1.CALCULATION_LABEL.PDIFF)
+                return defaultPercentage;
             if (((aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE_1.AGGREGATE.COUNT ||
                 (aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE_1.AGGREGATE.DISTINCTCOUNT) &&
                 hasDefaultFormat)

package/dist/cjs/column_format/interfaces/IChartColumn.d.ts

@@ -2,6 +2,7 @@ import { IColumnSortingSettings, IColumnType, IFormatOutputFormat, IFormulaType
 import { IColumnAggregate } from "../../columns/interfaces/IColumnAggregate";
 import { IColumnDateGroupSettings } from "../../columns/interfaces/IColumnDateGroupSettings";
 import { IColumnScale } from "../../columns/interfaces/IColumnScale";
+import { IColumnCalculation } from "../../columns/interfaces/IColunmCalculation";
 import { IFormatDefaultFormat } from "../../interfaces/format/IFormatDefaultFormat";
 export interface IChartColumn {
     aggregate: IColumnAggregate;
@@ -20,4 +21,5 @@ export interface IChartColumn {
     sorting?: IColumnSortingSettings;
     text: string;
     type: IColumnType;
+    calculation?: IColumnCalculation;
 }

package/dist/cjs/columns/interfaces/IColunmCalculation.d.ts

@@ -0,0 +1,5 @@
+export interface IColumnCalculation {
+    abbreviation: string;
+    aggregate?: string;
+    value?: string;
+}

package/dist/cjs/columns/interfaces/IColunmCalculation.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/filters/adapters/adaptDateGroupingProperty.js

@@ -10,7 +10,7 @@ const DATE_DISTINCT_TIME_PROPERTY_1 = require("../../dates/constants/DATE_DISTIN
  * @returns a adapted property
  */
 function adaptDateGroupingProperty(property) {
-    return ODD_PROPERTY[property];
+    return ODD_PROPERTY[property] || property;
 }
 exports.adaptDateGroupingProperty = adaptDateGroupingProperty;
 const ODD_PROPERTY = {

package/dist/column_format/helpers/defineTableChartFormat.js

@@ -1,23 +1,28 @@
-import { AGGREGATE, COLUMN, isEmpty } from "../..";
+import { AGGREGATE } from "../../charts/constants/AGGREGATE";
+import { COLUMN } from "../../columns/constants/COLUMN";
+import { isEmpty } from "../../general/mix/isEmpty";
 import { CHART_GROUPS } from "../constants/CHART_GROUP";
-import { DATEGROUP_UNSUPPORT_FORMAT } from "../constants/DATEGROUP_UNSUPPORT_FORMAT";
 import { STRING_FORMAT } from "../constants/STRING_FORMAT";
 import { TABLE_TYPE } from "../constants/TABLE_TYPE";
 import { columnTypeByChart } from "./columnTypeByChart";
+import { CALCULATION_LABEL } from "../../qrvey/constants/CALCULATION_LABEL";
 /**
  * It returns the format of a column based on the column type, the chart type, and the chart settings
  * @param {IChartColumn} column - IChartColumn
  * @param {IColumnFormatSettings} settings - IColumnFormatSettings
  */
 export const defineTableChartFormat = (column, settings) => {
-    const { aggregate, defaultFormat, outputFormat, selectedFormat, dateGroup } = column;
+    const { aggregate, defaultFormat, outputFormat, selectedFormat, calculation, } = column;
     const { tableType, shelfType } = settings;
     //Defaults
     const defaultText = "Default";
-    const defaultNumeric = { type: "NUMERIC", format: "Numeric" };
+    const defaultNumeric = { type: "NUMERIC", format: "Decimal" /* LOCALE_FORMATS.DECIMAL */ };
+    const defaultPercentage = {
+        type: "NUMERIC",
+        format: "Percentage" /* LOCALE_FORMATS.PERCENTAGE */,
+    };
     const isGroupedTable = tableType === TABLE_TYPE.GROUPED;
     const columnType = columnTypeByChart(column, shelfType, CHART_GROUPS.TABLES, isGroupedTable);
-    const noFormatSupported = DATEGROUP_UNSUPPORT_FORMAT.some((gp) => gp === (dateGroup === null || dateGroup === void 0 ? void 0 : dateGroup.label));
     const hasDefaultFormat = isEmpty(selectedFormat) ||
         (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === defaultText ||
         (selectedFormat === null || selectedFormat === void 0 ? void 0 : selectedFormat.format) === defaultText;
@@ -34,11 +39,9 @@ export const defineTableChartFormat = (column, settings) => {
         case COLUMN.TEXT_LABEL:
             return STRING_FORMAT.NONE;
         case COLUMN.DATE: {
-            if (noFormatSupported) {
-                return STRING_FORMAT.NONE;
-            }
-            else if (hasDefaultFormat) {
-                const columnDefaultFormat = defaultFormat || outputFormat || { type: 'DATE', format: 'MM/DD/YYYY' };
+            if (hasDefaultFormat) {
+                const columnDefaultFormat = defaultFormat ||
+                    outputFormat || { type: "DATE", format: "MM/DD/YYYY" };
                 return Object.assign(Object.assign({}, defaultFormat), { format: defaultText, originalFormat: Object.assign({}, columnDefaultFormat), type: "DATE" });
             }
             else {
@@ -48,6 +51,8 @@ export const defineTableChartFormat = (column, settings) => {
         case COLUMN.NUMERIC:
         case COLUMN.RATING:
         case COLUMN.SLIDEBAR: {
+            if ((calculation === null || calculation === void 0 ? void 0 : calculation.value) === CALCULATION_LABEL.PDIFF)
+                return defaultPercentage;
             if (hasDefaultFormat) {
                 if ((aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE.COUNT ||
                     (aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE.DISTINCTCOUNT)

package/dist/column_format/helpers/defineXYChartFormat.js

@@ -1,6 +1,7 @@
 import { AGGREGATE } from "../../charts/constants/AGGREGATE";
 import { COLUMN } from "../../columns/constants/COLUMN";
 import { isEmpty } from "../../general/mix/isEmpty";
+import { CALCULATION_LABEL } from "../../qrvey/constants/CALCULATION_LABEL";
 import { CHART_GROUPS } from "../constants/CHART_GROUP";
 import { DATEGROUP_UNSUPPORT_FORMAT } from "../constants/DATEGROUP_UNSUPPORT_FORMAT";
 import { STRING_FORMAT } from "../constants/STRING_FORMAT";
@@ -13,13 +14,17 @@ import { columnTypeByChart } from "./columnTypeByChart";
  * @param {IColumnFormatSettings} settings - IColumnFormatSettings
  */
 export const defineXYChartFormat = (column, settings) => {
-    const { aggregate, type, defaultFormat, outputFormat, selectedFormat, dateGroup, } = column;
+    const { aggregate, type, defaultFormat, outputFormat, selectedFormat, dateGroup, calculation, } = column;
     const { shelfType, withoutFormat } = settings;
     const columnDefaultFormat = defaultFormat || outputFormat;
     //Defaults
     const defaultText = "Default";
     const defaultAbb = { type: "NUMERIC", format: "Abbreviated" /* LOCALE_FORMATS.ABBREVIATED */ };
     const defaultDecimal = { type: "NUMERIC", format: "Decimal" /* LOCALE_FORMATS.DECIMAL */ };
+    const defaultPercentage = {
+        type: "NUMERIC",
+        format: "Percentage" /* LOCALE_FORMATS.PERCENTAGE */,
+    };
     const columnType = columnTypeByChart(column, shelfType, CHART_GROUPS.XY);
     const noFormatSupported = DATEGROUP_UNSUPPORT_FORMAT.some((gp) => gp === (dateGroup === null || dateGroup === void 0 ? void 0 : dateGroup.label));
     const isUsedAsNumericColumn = type !== columnType;
@@ -55,6 +60,8 @@ export const defineXYChartFormat = (column, settings) => {
         case COLUMN.NUMERIC:
         case COLUMN.RATING:
         case COLUMN.SLIDEBAR: {
+            if ((calculation === null || calculation === void 0 ? void 0 : calculation.aggregate) === CALCULATION_LABEL.PDIFF)
+                return defaultPercentage;
             if (((aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE.COUNT ||
                 (aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE.DISTINCTCOUNT) &&
                 hasDefaultFormat)

package/dist/column_format/interfaces/IChartColumn.d.ts

@@ -2,6 +2,7 @@ import { IColumnSortingSettings, IColumnType, IFormatOutputFormat, IFormulaType
 import { IColumnAggregate } from "../../columns/interfaces/IColumnAggregate";
 import { IColumnDateGroupSettings } from "../../columns/interfaces/IColumnDateGroupSettings";
 import { IColumnScale } from "../../columns/interfaces/IColumnScale";
+import { IColumnCalculation } from "../../columns/interfaces/IColunmCalculation";
 import { IFormatDefaultFormat } from "../../interfaces/format/IFormatDefaultFormat";
 export interface IChartColumn {
     aggregate: IColumnAggregate;
@@ -20,4 +21,5 @@ export interface IChartColumn {
     sorting?: IColumnSortingSettings;
     text: string;
     type: IColumnType;
+    calculation?: IColumnCalculation;
 }

package/dist/columns/interfaces/IColunmCalculation.d.ts

@@ -0,0 +1,5 @@
+export interface IColumnCalculation {
+    abbreviation: string;
+    aggregate?: string;
+    value?: string;
+}

package/dist/columns/interfaces/IColunmCalculation.js

@@ -0,0 +1 @@
+export {};

package/dist/filters/adapters/adaptDateGroupingProperty.js

@@ -7,7 +7,7 @@ import { DATE_DISTINCT_TIME_PROPERTY } from "../../dates/constants/DATE_DISTINCT
  * @returns a adapted property
  */
 export function adaptDateGroupingProperty(property) {
-    return ODD_PROPERTY[property];
+    return ODD_PROPERTY[property] || property;
 }
 const ODD_PROPERTY = {
     "p&quarter": DATE_DISTINCT_PROPERTY.YEAR_QUARTER,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.4.0-6",
+  "version": "1.4.0-7",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",