@qrvey/utils 1.2.4-2 → 1.2.4-23

package/dist/interfaces/Qrvey.Interface.d.ts

@@ -1,13 +1,5 @@
-import { AGGREGATE_ABBREVIATION } from "../qrvey/constants/AGGREGATE_ABBREVIATION";
-import { AGGREGATE_LABEL } from "../qrvey/constants/AGGREGATE_LABEL";
 import { CALCULATION_ABBREVIATION } from "../qrvey/constants/CALCULATION_ABBREVIATION";
 import { CALCULATION_LABEL } from "../qrvey/constants/CALCULATION_LABEL";
-export interface IColumnAggregate {
-    abbreviation: IColumnAggregateAbbreviation;
-    id: string;
-    label: IColumnAggregateLabel;
-    text: string;
-}
 export interface IColumnCalculation {
     abbreviation: IColumnCalculationAbbreviation;
     id: string;
@@ -15,7 +7,5 @@ export interface IColumnCalculation {
     type: string;
     value: IColumnCalculationLabel;
 }
-export declare type IColumnAggregateAbbreviation = AGGREGATE_ABBREVIATION;
-export declare type IColumnAggregateLabel = AGGREGATE_LABEL;
 export declare type IColumnCalculationLabel = CALCULATION_LABEL;
 export declare type IColumnCalculationAbbreviation = CALCULATION_ABBREVIATION;

package/dist/interfaces/index.d.ts

@@ -1,4 +1,4 @@
 export * from './Chart.Interface';
 export * from './IChartBuilder.Interface';
-export * from './general/index';
+export * from './general';
 export * from './Qrvey.Interface';

package/dist/interfaces/index.js

@@ -1,4 +1,4 @@
 export * from './Chart.Interface';
 export * from './IChartBuilder.Interface';
-export * from './general/index';
+export * from './general';
 export * from './Qrvey.Interface';

package/dist/qrvey/constants/CALCULATION_INFO_LIST.d.ts

@@ -1 +1 @@
-export declare const AGGREGATE_INFO_LIST: import("../interfaces/ICalculationInfo").ICalculationInfo[];
+export declare const CALCULATION_INFO_LIST: import("..").ICalculationInfo[];

package/dist/qrvey/constants/CALCULATION_INFO_LIST.js

@@ -1,6 +1,6 @@
 import { CALCULATION } from "./CALCULATION";
 import { CALCULATION_INFO } from "./CALCULATION_INFO";
-export const AGGREGATE_INFO_LIST = [
+export const CALCULATION_INFO_LIST = [
     CALCULATION_INFO[CALCULATION.AVG],
     CALCULATION_INFO[CALCULATION.SUM],
     CALCULATION_INFO[CALCULATION.MIN],

package/dist/qrvey/constants/index.d.ts

@@ -1,7 +1,4 @@
-export * from './AGGREGATE_ABBREVIATION';
-export * from './AGGREGATE_INFO';
-export * from './AGGREGATE_LABEL';
-export * from './AGGREGATE';
 export * from './CALCULATION_ABBREVIATION';
+export * from './CALCULATION_INFO_LIST';
 export * from './CALCULATION_LABEL';
 export * from './CALCULATION';

package/dist/qrvey/constants/index.js

@@ -1,7 +1,4 @@
-export * from './AGGREGATE_ABBREVIATION';
-export * from './AGGREGATE_INFO';
-export * from './AGGREGATE_LABEL';
-export * from './AGGREGATE';
 export * from './CALCULATION_ABBREVIATION';
+export * from './CALCULATION_INFO_LIST';
 export * from './CALCULATION_LABEL';
 export * from './CALCULATION';

package/dist/{cjs/columns/interfaces/IColumnCalculationType.d.ts → qrvey/interfaces/ICalculationType.d.ts}

@@ -1,2 +1,2 @@
-import { CALCULATION } from "../../qrvey/constants/CALCULATION";
+import { CALCULATION } from "../constants/CALCULATION";
 export declare type IColumnCalculationType = typeof CALCULATION[keyof typeof CALCULATION];

package/dist/qrvey/interfaces/ICalculationType.js

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

package/dist/qrvey/interfaces/index.d.ts

@@ -1 +1,5 @@
+export * from './IBDataset';
+export * from './ICalculation';
+export * from './ICalculationInfo';
+export * from './ICalculationType';
 export * from './IDataset';

package/dist/qrvey/interfaces/index.js

@@ -1 +1,5 @@
+export * from './IBDataset';
+export * from './ICalculation';
+export * from './ICalculationInfo';
+export * from './ICalculationType';
 export * from './IDataset';

package/dist/services/helpers/Request.js

@@ -65,7 +65,7 @@ export default class Request {
         }
         const timezoneControl = this.getTimezoneControl(reqData.config);
         if (timezoneControl) {
-            cfg.headers['q-timezone-control'] = `offset=<${timezoneControl}>;use-client-offset-only`;
+            cfg.headers['q-timezone-control'] = `offset=${timezoneControl};use-client-offset-only`;
         }
         // AbortSignal (https://developers.google.com/web/updates/2017/09/abortable-fetch)
         if (reqData.config && reqData.config.signal) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.2.4-2",
+  "version": "1.2.4-23",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc && tsc -m commonjs --outDir dist/cjs",
     "publish": "node prepareToPublish.js && npm login && np",
-    "publish-prerelease": "node prepareToPublish.js && npm login && np --any-branch",
+    "publish-prerelease": "node prepareToPublish.js && npm login && np --any-branch --tag=$npm_config_tag",
     "test": "jest test",
     "test:watch": "jest --watch test",
     "lint": "eslint src --quiet --exit-on-fatal-error --ext .ts,.js",
@@ -23,9 +23,9 @@
     "ts-jest": "27.0.5",
     "typedoc": "0.22.5",
     "typescript": "4.4.4",
-    "@typescript-eslint/eslint-plugin": "5.0.0",
-    "@typescript-eslint/parser": "5.0.0",
-    "eslint": "8.0.0"
+    "@typescript-eslint/eslint-plugin": "5.3.0",
+    "@typescript-eslint/parser": "5.3.0",
+    "eslint": "8.1.0"
   },
   "peerDependencies": {
     "np": "^6.2.3"

package/src/{qrvey → charts}/constants/AGGREGATE_INFO.ts

@@ -1,10 +1,10 @@
-import { IAggregate } from "../interfaces/IAggregate";
 import { IAggregateInfo } from "../interfaces/IAggregateInfo";
+import { IAggregateType } from "../interfaces/IAggregateType";
 import { AGGREGATE } from "./AGGREGATE";
 import { AGGREGATE_ABBREVIATION } from "./AGGREGATE_ABBREVIATION";
 import { AGGREGATE_LABEL } from "./AGGREGATE_LABEL";
 
-export const AGGREGATE_INFO: { [key in IAggregate]: IAggregateInfo } = {
+export const AGGREGATE_INFO: { [key in IAggregateType]: IAggregateInfo } = {
     [AGGREGATE.NONE]: { value: AGGREGATE.NONE, displayed: true, label: AGGREGATE_LABEL.NONE, shortLabel: AGGREGATE_LABEL.NONE, abbrLabel: AGGREGATE_ABBREVIATION.NONE },
     [AGGREGATE.AVG]: { value: AGGREGATE.AVG, displayed: true, label: AGGREGATE_LABEL.AVG, shortLabel: AGGREGATE_LABEL.AVG, abbrLabel: AGGREGATE_ABBREVIATION.AVG },
     [AGGREGATE.MEDIAN]: { value: AGGREGATE.MEDIAN, displayed: true, label: AGGREGATE_LABEL.MEDIAN, shortLabel: AGGREGATE_LABEL.MEDIAN, abbrLabel: AGGREGATE_ABBREVIATION.MEDIAN },

package/src/charts/constants/AGGREGATE_LABEL.ts

@@ -0,0 +1,11 @@
+export enum AGGREGATE_LABEL {
+    NONE = 'None',
+    AVG = 'Average',
+    MEDIAN = 'Median',
+    MIN = 'Minimum',
+    MAX = 'Maximum',
+    SUM = 'Sum',
+    STDEV = 'Standard deviation',
+    COUNT = 'Count',
+    DISTINCTCOUNT = 'Distinct Count',
+}

package/src/charts/constants/index.ts

@@ -0,0 +1,5 @@
+export * from './AGGREGATE_ABBREVIATION';
+export * from './AGGREGATE_INFO_LIST';
+export * from './AGGREGATE_INFO';
+export * from './AGGREGATE_LABEL';
+export * from './AGGREGATE';

package/src/charts/index.ts

@@ -0,0 +1,2 @@
+export * from './constants/index';
+export * from './interfaces/index';

package/src/charts/interfaces/IAggregateAbbreviation.ts

@@ -0,0 +1,3 @@
+import { AGGREGATE_ABBREVIATION } from "../constants/AGGREGATE_ABBREVIATION";
+
+export type IAggregateAbbreviation = AGGREGATE_ABBREVIATION;

package/src/charts/interfaces/IAggregateInfo.ts

@@ -0,0 +1,11 @@
+
+import { IGeneralInfo } from "../../interfaces/general/IGeneralInfo";
+import { IAggregateAbbreviation } from "./IAggregateAbbreviation";
+import { IAggregateLabel } from "./IAggregateLabel";
+import { IAggregateType } from "./IAggregateType";
+
+export interface IAggregateInfo extends IGeneralInfo {
+    abbrLabel: IAggregateAbbreviation;
+    label: IAggregateLabel;
+    value: IAggregateType;
+}

package/src/charts/interfaces/IAggregateLabel.ts

@@ -0,0 +1,3 @@
+import { AGGREGATE_LABEL } from "../constants/AGGREGATE_LABEL";
+
+export type IAggregateLabel = AGGREGATE_LABEL;

package/src/{qrvey/interfaces/IAggregate.ts → charts/interfaces/IAggregateType.ts}

@@ -1,3 +1,3 @@
 import { AGGREGATE } from "../constants/AGGREGATE";
 
-export type IAggregate = AGGREGATE;
+export type IAggregateType = AGGREGATE;

package/src/charts/interfaces/index.ts

@@ -0,0 +1,4 @@
+export * from './IAggregateAbbreviation';
+export * from './IAggregateInfo';
+export * from './IAggregateLabel';
+export * from './IAggregateType';

package/src/columns/constants/COLUMN.ts

@@ -1,20 +1,12 @@
-// import { COMPLEX_COLUMN, COMPOUND_COLUMN } from ".";
-
-// [TODO: Assing/merge/reuse/Import/extend the COMPLEX_COLUMN and COMPOUND_COLUMN files in the COLUMN enum]
+// [TODO: Assing/merge/reuse/Import/extend the COMPLEX_COLUMN, COMPOUND_COLUMN and NUMERICAL_COLUMN files in the COLUMN enum]
 export enum COLUMN {
     SINGLE_CHOICE = 'SINGLE_CHOICE',
     MULTIPLE_CHOICE = 'MULTIPLE_CHOICE',
-    RATING = 'RATING',
     YES_NO = 'YES_NO',
     RANKING = 'RANKING',
     DATE = 'DATE',
-    SLIDEBAR = 'SLIDEBAR',
     SIGNATURE = 'SIGNATURE',
     DROPDOWN = 'DROPDOWN',
-    NUMERIC = 'NUMERIC',
-    NUMERICC = 'NUMERIC-C',
-    NUMERICP = 'NUMERIC-P',
-    NUMERICG = 'NUMERIC-G',
     IMAGE = 'IMAGE',
     EMAIL_FORM = 'EMAIL_FORM',
     PHONE = 'PHONE',
@@ -34,6 +26,14 @@ export enum COLUMN {
     AGGREGATED_FORMULA = 'AGGREGATED_FORMULA',
     BUCKET = 'BUCKET',
 
+    // ...NUMERICAL_COLUMN
+    SLIDEBAR = 'SLIDEBAR',
+    NUMERIC = 'NUMERIC',
+    NUMERICC = 'NUMERIC-C',
+    NUMERICP = 'NUMERIC-P',
+    NUMERICG = 'NUMERIC-G',
+    RATING = 'RATING',
+
     //...COMPLEX_COLUMN,
     TEXTFIELD = 'TEXTFIELD',
     LONGTEXT = 'LONGTEXT',

package/src/columns/constants/COLUMN_INFO.ts

@@ -3,40 +3,37 @@ import { COLUMN } from "./COLUMN";
 import { IColumnType } from "../interfaces/IColumnType";
 import { IColumnInfo } from "../interfaces/IColumnInfo";
 import { COMPLEX_COLUMN_INFO } from "./COMPLEX_COLUMN_INFO";
+import { COLUMN_LABEL } from "./COLUMN_LABEL";
+import { NUMERICAL_COLUMN_INFO } from "./NUMERICAL_COLUMN_INFO";
 
 /**
  * @description Key/array of column property info
  */
 export const COLUMN_INFO: { [key in IColumnType]: IColumnInfo } = {
-    [COLUMN.SINGLE_CHOICE]: { label: 'Single Choice', shortLabel: 'Single Choice', abbrLabel: 'SC', value: COLUMN.SINGLE_CHOICE, displayed: true },
-    [COLUMN.MULTIPLE_CHOICE]: { label: 'Multiple Choice', shortLabel: 'Multiple Choice', abbrLabel: 'MC', value: COLUMN.MULTIPLE_CHOICE, displayed: true },
-    [COLUMN.RATING]: { label: 'Rating', shortLabel: 'Rating', abbrLabel: 'RA', value: COLUMN.RATING, displayed: true },
-	[COLUMN.YES_NO]: { label: 'Yes No', shortLabel: 'Yes No', abbrLabel: 'YS', value: COLUMN.YES_NO, displayed: true },
-	[COLUMN.RANKING]: { label: 'Ranking', shortLabel: 'Ranking', abbrLabel: 'RAN', value: COLUMN.RANKING, displayed: true },
-	[COLUMN.DATE]: { label: 'Date', shortLabel: 'Date', abbrLabel: 'DA', value: COLUMN.DATE, displayed: true },
-	[COLUMN.SLIDEBAR]: { label: 'Slidebar', shortLabel: 'Slidebar', abbrLabel: 'SB', value: COLUMN.SLIDEBAR, displayed: true },
-	[COLUMN.SIGNATURE]: { label: 'Signature', shortLabel: 'Signature', abbrLabel: 'SIGN', value: COLUMN.SIGNATURE, displayed: true },
-	[COLUMN.DROPDOWN]: { label: 'Dropdown', shortLabel: 'Dropdown', abbrLabel: 'DD', value: COLUMN.DROPDOWN, displayed: true },
-	[COLUMN.NUMERIC]: { label: 'Numeric', shortLabel: 'Numeric', abbrLabel: 'NUM', value: COLUMN.NUMERIC, displayed: true },
-	[COLUMN.NUMERICC]: { label: 'Numeric-C', shortLabel: 'Numeric-C', abbrLabel: 'NUMC', value: COLUMN.NUMERICC, displayed: false },
-	[COLUMN.NUMERICP]: { label: 'Numeric-P', shortLabel: 'Numeric-P', abbrLabel: 'NUMP', value: COLUMN.NUMERICP, displayed: false },
-	[COLUMN.NUMERICG]: { label: 'NUMERIC-G', shortLabel: 'Numeric-G', abbrLabel: 'NUMG', value: COLUMN.NUMERICG, displayed: false },
-	[COLUMN.IMAGE]: { label: 'Image', shortLabel: 'Image', abbrLabel: 'IMG', value: COLUMN.IMAGE, displayed: true },
-	[COLUMN.EMAIL_FORM]: { label: 'Email Form', shortLabel: 'Email', abbrLabel: 'EML', value: COLUMN.EMAIL_FORM, displayed: true },
-	[COLUMN.PHONE]: { label: 'Phone', shortLabel: 'Phone', abbrLabel: 'PHN', value: COLUMN.PHONE, displayed: true },
-	[COLUMN.PASSWORD]: { label: 'Password', shortLabel: 'Password', abbrLabel: 'PWD', value: COLUMN.PASSWORD, displayed: true },
-	[COLUMN.CHECKLIST]: { label: 'Check List', shortLabel: 'Check List', abbrLabel: 'CL', value: COLUMN.CHECKLIST, displayed: false },
-	[COLUMN.NPS_SCORE]: { label: 'NPS Score', shortLabel: 'NPS Score', abbrLabel: 'NPMS', value: COLUMN.NPS_SCORE, displayed: false },
-	[COLUMN.NPS_FEEDBACK]: { label: 'NPS Feedback', shortLabel: 'NPS Feedback', abbrLabel: 'NPSFB', value: COLUMN.NPS_FEEDBACK, displayed: false },
-	[COLUMN.TEXT_LABEL]: { label: 'Text Label', shortLabel: 'Text Label', abbrLabel: 'TL', value: COLUMN.TEXT_LABEL, displayed: true },
-	[COLUMN.TEXT_CATEGORY]: { label: 'Text Category', shortLabel: 'Text Category', abbrLabel: 'TC', value: COLUMN.TEXT_CATEGORY, displayed: true },
-	[COLUMN.LOOKUP]: { label: 'Lookup', shortLabel: 'Lookup', abbrLabel: 'LUP', value: COLUMN.LOOKUP, displayed: true },
-	[COLUMN.HEADLINE]: { label: 'Headline', shortLabel: 'Headline', abbrLabel: 'HL', value: COLUMN.HEADLINE, displayed: false },
-	[COLUMN.SECTION]: { label: 'Section', shortLabel: 'Section', abbrLabel: 'SCN', value: COLUMN.SECTION, displayed: false },
-	[COLUMN.FORMULA]: { label: 'Formula', shortLabel: 'Formula', abbrLabel: 'FML', value: COLUMN.FORMULA, displayed: true },
-	[COLUMN.AGGREGATED_FORMULA]: { label: 'Aggregated Formula', shortLabel: 'Agg Formula', abbrLabel: 'AF', value: COLUMN.AGGREGATED_FORMULA, displayed: true },
-	[COLUMN.BUCKET]: { label: 'Bucket', shortLabel: 'Bucket', abbrLabel: 'BCT', value: COLUMN.BUCKET, displayed: true },
+    [COLUMN.SINGLE_CHOICE]: { label: COLUMN_LABEL.SINGLE_CHOICE, shortLabel: 'Single Choice', abbrLabel: 'SC', value: COLUMN.SINGLE_CHOICE, displayed: true },
+    [COLUMN.MULTIPLE_CHOICE]: { label: COLUMN_LABEL.MULTIPLE_CHOICE, shortLabel: 'Multiple Choice', abbrLabel: 'MC', value: COLUMN.MULTIPLE_CHOICE, displayed: true },
+	[COLUMN.YES_NO]: { label: COLUMN_LABEL.YES_NO, shortLabel: 'Yes No', abbrLabel: 'YS', value: COLUMN.YES_NO, displayed: true },
+	[COLUMN.RANKING]: { label: COLUMN_LABEL.RANKING, shortLabel: 'Ranking', abbrLabel: 'RAN', value: COLUMN.RANKING, displayed: true },
+	[COLUMN.DATE]: { label: COLUMN_LABEL.DATE, shortLabel: 'Date', abbrLabel: 'DA', value: COLUMN.DATE, displayed: true },
+	[COLUMN.SIGNATURE]: { label: COLUMN_LABEL.SIGNATURE, shortLabel: 'Signature', abbrLabel: 'SIGN', value: COLUMN.SIGNATURE, displayed: true },
+	[COLUMN.DROPDOWN]: { label: COLUMN_LABEL.DROPDOWN, shortLabel: 'Dropdown', abbrLabel: 'DD', value: COLUMN.DROPDOWN, displayed: true },
+	[COLUMN.IMAGE]: { label: COLUMN_LABEL.IMAGE, shortLabel: 'Image', abbrLabel: 'IMG', value: COLUMN.IMAGE, displayed: true },
+	[COLUMN.EMAIL_FORM]: { label: COLUMN_LABEL.EMAIL_FORM, shortLabel: 'Email', abbrLabel: 'EML', value: COLUMN.EMAIL_FORM, displayed: true },
+	[COLUMN.PHONE]: { label: COLUMN_LABEL.PHONE, shortLabel: 'Phone', abbrLabel: 'PHN', value: COLUMN.PHONE, displayed: true },
+	[COLUMN.PASSWORD]: { label: COLUMN_LABEL.PASSWORD, shortLabel: 'Password', abbrLabel: 'PWD', value: COLUMN.PASSWORD, displayed: true },
+	[COLUMN.CHECKLIST]: { label: COLUMN_LABEL.CHECKLIST, shortLabel: 'Check List', abbrLabel: 'CL', value: COLUMN.CHECKLIST, displayed: false },
+	[COLUMN.NPS_SCORE]: { label: COLUMN_LABEL.NPS_SCORE, shortLabel: 'NPS Score', abbrLabel: 'NPMS', value: COLUMN.NPS_SCORE, displayed: false },
+	[COLUMN.NPS_FEEDBACK]: { label: COLUMN_LABEL.NPS_FEEDBACK, shortLabel: 'NPS Feedback', abbrLabel: 'NPSFB', value: COLUMN.NPS_FEEDBACK, displayed: false },
+	[COLUMN.TEXT_LABEL]: { label: COLUMN_LABEL.TEXT_LABEL, shortLabel: 'Text Label', abbrLabel: 'TL', value: COLUMN.TEXT_LABEL, displayed: true },
+	[COLUMN.TEXT_CATEGORY]: { label: COLUMN_LABEL.TEXT_CATEGORY, shortLabel: 'Text Category', abbrLabel: 'TC', value: COLUMN.TEXT_CATEGORY, displayed: true },
+	[COLUMN.LOOKUP]: { label: COLUMN_LABEL.LOOKUP, shortLabel: 'Lookup', abbrLabel: 'LUP', value: COLUMN.LOOKUP, displayed: true },
+	[COLUMN.HEADLINE]: { label: COLUMN_LABEL.HEADLINE, shortLabel: 'Headline', abbrLabel: 'HL', value: COLUMN.HEADLINE, displayed: false },
+	[COLUMN.SECTION]: { label: COLUMN_LABEL.SECTION, shortLabel: 'Section', abbrLabel: 'SCN', value: COLUMN.SECTION, displayed: false },
+	[COLUMN.FORMULA]: { label: COLUMN_LABEL.FORMULA, shortLabel: 'Formula', abbrLabel: 'FML', value: COLUMN.FORMULA, displayed: true },
+	[COLUMN.AGGREGATED_FORMULA]: { label: COLUMN_LABEL.AGGREGATED_FORMULA, shortLabel: 'Agg Formula', abbrLabel: 'AF', value: COLUMN.AGGREGATED_FORMULA, displayed: true },
+	[COLUMN.BUCKET]: { label: COLUMN_LABEL.BUCKET, shortLabel: 'Bucket', abbrLabel: 'BCT', value: COLUMN.BUCKET, displayed: true },
 
+	...NUMERICAL_COLUMN_INFO,
 	...COMPOUND_COLUMN_INFO,
 	...COMPLEX_COLUMN_INFO,
 };

package/src/columns/constants/COLUMN_INFO_LIST.ts

@@ -3,21 +3,16 @@ import { COLUMN } from "./COLUMN";
 import { COLUMN_INFO } from "./COLUMN_INFO";
 import { COMPLEX_COLUMN_INFO_LIST } from "./COMPLEX_COLUMN_INFO_LIST";
 import { COMPOUND_COLUMN_INFO_LIST } from "./COMPOUND_COLUMN_INFO_LIST";
+import { NUMERICAL_COLUMN_INFO_LIST } from "./NUMERICAL_COLUMN_INFO_LIST";
 
 export const COLUMN_INFO_LIST: IColumnInfo[] = [
     COLUMN_INFO[COLUMN.SINGLE_CHOICE],
     COLUMN_INFO[COLUMN.MULTIPLE_CHOICE],
-    COLUMN_INFO[COLUMN.RATING],
 	COLUMN_INFO[COLUMN.YES_NO],
 	COLUMN_INFO[COLUMN.RANKING],
 	COLUMN_INFO[COLUMN.DATE],
-	COLUMN_INFO[COLUMN.SLIDEBAR],
 	COLUMN_INFO[COLUMN.SIGNATURE],
 	COLUMN_INFO[COLUMN.DROPDOWN],
-	COLUMN_INFO[COLUMN.NUMERIC],
-	COLUMN_INFO[COLUMN.NUMERICC],
-	COLUMN_INFO[COLUMN.NUMERICP],
-	COLUMN_INFO[COLUMN.NUMERICG],
 	COLUMN_INFO[COLUMN.IMAGE],
 	COLUMN_INFO[COLUMN.EMAIL_FORM],
 	COLUMN_INFO[COLUMN.PHONE],
@@ -34,6 +29,7 @@ export const COLUMN_INFO_LIST: IColumnInfo[] = [
 	COLUMN_INFO[COLUMN.AGGREGATED_FORMULA],
 	COLUMN_INFO[COLUMN.BUCKET],
 
+	...NUMERICAL_COLUMN_INFO_LIST,
 	...COMPOUND_COLUMN_INFO_LIST,
 	...COMPLEX_COLUMN_INFO_LIST,
 ];

package/src/columns/constants/COLUMN_LABEL.ts

@@ -1,20 +1,15 @@
 import { COMPLEX_COLUMN_LABEL } from "./COMPLEX_COLUMN_LABEL";
 import { COMPOUND_COLUMN_LABEL } from "./COMPOUND_COLUMN_LABEL";
+import { NUMERICAL_COLUMN_LABEL } from "./NUMERICAL_COLUMN_LABEL";
 
 export const COLUMN_LABEL = {
     SINGLE_CHOICE: 'Single Choice',
     MULTIPLE_CHOICE: 'Multiple Choice',
-    RATING: 'Rating',
 	YES_NO: 'Yes No',
 	RANKING: 'Ranking',
 	DATE: 'Date',
-	SLIDEBAR: 'Slidebar',
 	SIGNATURE: 'Signature',
 	DROPDOWN: 'Dropdown',
-	NUMERIC: 'Numeric',
-	NUMERICC: 'Numeric-C',
-	NUMERICP: 'Numeric-P',
-	NUMERICG: 'NUMERIC-G',
 	IMAGE: 'Image',
 	EMAIL_FORM: 'Email Form',
 	PHONE: 'Phone',
@@ -31,6 +26,7 @@ export const COLUMN_LABEL = {
 	AGGREGATED_FORMULA: 'Aggregated Formula',
 	BUCKET: 'Bucket',
 
-    ...COMPOUND_COLUMN_LABEL,
+    ...NUMERICAL_COLUMN_LABEL,
+	...COMPOUND_COLUMN_LABEL,
     ...COMPLEX_COLUMN_LABEL,
 };

package/src/columns/constants/COLUMN_PROPERTY.ts

@@ -32,10 +32,10 @@ export enum COLUMN_PROPERTY {
     LONGTEXT_KEYPHRASES = 'keywords',
     LONGTEXT_SENTIMENTS = 'sentiment',
     LONGTEXT_ENTITIES = 'entitiestype',
-    SHORTTEXT_WORDS = 'words',
-    SHORTTEXT_KEYPHRASES = 'keywords',
-    SHORTTEXT_SENTIMENTS = 'sentiment',
-    SHORTTEXT_ENTITIES = 'entitiestype',
+    TEXTFIELD_WORDS = 'words',
+    TEXTFIELD_KEYPHRASES = 'keywords',
+    TEXTFIELD_SENTIMENTS = 'sentiment',
+    TEXTFIELD_ENTITIES = 'entitiestype',
     FILEUPLOAD_FILESIZE = 'fileSize',
     FILEUPLOAD_FILETYPE = 'fileType',
     IMAGEUPLOAD_IMAGESIZE = 'fileSize',

package/src/columns/constants/COMPLEX_COLUMN_PROPERTIES.ts

@@ -8,10 +8,10 @@ export const COMPLEX_COLUMN_PROPERTIES = [
 	COMPLEX_COLUMN_PROPERTY.LONGTEXT_KEYPHRASES,
 	COMPLEX_COLUMN_PROPERTY.LONGTEXT_SENTIMENTS,
 	COMPLEX_COLUMN_PROPERTY.LONGTEXT_ENTITIES,
-	COMPLEX_COLUMN_PROPERTY.SHORTTEXT_WORDS,
-	COMPLEX_COLUMN_PROPERTY.SHORTTEXT_KEYPHRASES,
-	COMPLEX_COLUMN_PROPERTY.SHORTTEXT_SENTIMENTS,
-	COMPLEX_COLUMN_PROPERTY.SHORTTEXT_ENTITIES,
+	COMPLEX_COLUMN_PROPERTY.TEXTFIELD_WORDS,
+	COMPLEX_COLUMN_PROPERTY.TEXTFIELD_KEYPHRASES,
+	COMPLEX_COLUMN_PROPERTY.TEXTFIELD_SENTIMENTS,
+	COMPLEX_COLUMN_PROPERTY.TEXTFIELD_ENTITIES,
 	COMPLEX_COLUMN_PROPERTY.FILEUPLOAD_FILESIZE,
 	COMPLEX_COLUMN_PROPERTY.FILEUPLOAD_FILETYPE,
 	COMPLEX_COLUMN_PROPERTY.IMAGEUPLOAD_IMAGESIZE,

package/src/columns/constants/COMPLEX_COLUMN_PROPERTY.ts

@@ -3,10 +3,10 @@ export enum COMPLEX_COLUMN_PROPERTY {
     LONGTEXT_KEYPHRASES = 'keywords',
     LONGTEXT_SENTIMENTS = 'sentiment',
     LONGTEXT_ENTITIES = 'entitiestype',
-    SHORTTEXT_WORDS = 'words',
-    SHORTTEXT_KEYPHRASES = 'keywords',
-    SHORTTEXT_SENTIMENTS = 'sentiment',
-    SHORTTEXT_ENTITIES = 'entitiestype',
+    TEXTFIELD_WORDS = 'words',
+    TEXTFIELD_KEYPHRASES = 'keywords',
+    TEXTFIELD_SENTIMENTS = 'sentiment',
+    TEXTFIELD_ENTITIES = 'entitiestype',
     FILEUPLOAD_FILESIZE = 'fileSize',
     FILEUPLOAD_FILETYPE = 'fileType',
     IMAGEUPLOAD_IMAGESIZE = 'fileSize',

package/src/columns/constants/COMPLEX_COLUMN_PROPERTY_INFO.ts

@@ -15,10 +15,10 @@ export const COMPLEX_COLUMN_PROPERTY_INFO: { [key in IComplexColumnType]: IColum
         { label: COMPLEX_COLUMN_PROPERTY_LABEL.LONGTEXT_ENTITIES, shortLabel: 'Entities', abbrLabel: 'ENT', value: COMPLEX_COLUMN_PROPERTY.LONGTEXT_ENTITIES, displayed: true },
     ],
     [COMPLEX_COLUMN.TEXTFIELD]: [
-        { label: COMPLEX_COLUMN_PROPERTY_LABEL.SHORTTEXT_WORDS, shortLabel: 'Words', abbrLabel: 'WRD', value: COMPLEX_COLUMN_PROPERTY.SHORTTEXT_WORDS, displayed: true },
-        { label: COMPLEX_COLUMN_PROPERTY_LABEL.SHORTTEXT_KEYPHRASES, shortLabel: 'Keyphrases', abbrLabel: 'KP', value: COMPLEX_COLUMN_PROPERTY.SHORTTEXT_KEYPHRASES, displayed: true },
-        { label: COMPLEX_COLUMN_PROPERTY_LABEL.SHORTTEXT_SENTIMENTS, shortLabel: 'Sentiments', abbrLabel: 'SEN', value: COMPLEX_COLUMN_PROPERTY.SHORTTEXT_SENTIMENTS, displayed: true },
-        { label: COMPLEX_COLUMN_PROPERTY_LABEL.SHORTTEXT_ENTITIES, shortLabel: 'Entities', abbrLabel: 'ENT', value: COMPLEX_COLUMN_PROPERTY.SHORTTEXT_ENTITIES, displayed: true },
+        { label: COMPLEX_COLUMN_PROPERTY_LABEL.TEXTFIELD_WORDS, shortLabel: 'Words', abbrLabel: 'WRD', value: COMPLEX_COLUMN_PROPERTY.TEXTFIELD_WORDS, displayed: true },
+        { label: COMPLEX_COLUMN_PROPERTY_LABEL.TEXTFIELD_KEYPHRASES, shortLabel: 'Keyphrases', abbrLabel: 'KP', value: COMPLEX_COLUMN_PROPERTY.TEXTFIELD_KEYPHRASES, displayed: true },
+        { label: COMPLEX_COLUMN_PROPERTY_LABEL.TEXTFIELD_SENTIMENTS, shortLabel: 'Sentiments', abbrLabel: 'SEN', value: COMPLEX_COLUMN_PROPERTY.TEXTFIELD_SENTIMENTS, displayed: true },
+        { label: COMPLEX_COLUMN_PROPERTY_LABEL.TEXTFIELD_ENTITIES, shortLabel: 'Entities', abbrLabel: 'ENT', value: COMPLEX_COLUMN_PROPERTY.TEXTFIELD_ENTITIES, displayed: true },
     ],
     [COMPLEX_COLUMN.FILEUPLOAD]: [
         { label: COMPLEX_COLUMN_PROPERTY_LABEL.FILEUPLOAD_FILESIZE, shortLabel: 'Size', abbrLabel: 'SZ', value: COMPLEX_COLUMN_PROPERTY.FILEUPLOAD_FILESIZE, displayed: true },

package/src/columns/constants/COMPLEX_COLUMN_PROPERTY_LABEL.ts

@@ -3,10 +3,10 @@ export enum COMPLEX_COLUMN_PROPERTY_LABEL {
     LONGTEXT_KEYPHRASES = 'Keyphrases',
     LONGTEXT_SENTIMENTS = 'Sentiments',
     LONGTEXT_ENTITIES = 'Entities',
-    SHORTTEXT_WORDS = 'Words',
-    SHORTTEXT_KEYPHRASES = 'Keyphrases',
-    SHORTTEXT_SENTIMENTS = 'Sentiments',
-    SHORTTEXT_ENTITIES = 'Entities',
+    TEXTFIELD_WORDS = 'Words',
+    TEXTFIELD_KEYPHRASES = 'Keyphrases',
+    TEXTFIELD_SENTIMENTS = 'Sentiments',
+    TEXTFIELD_ENTITIES = 'Entities',
     FILEUPLOAD_FILESIZE = 'File Size',
     FILEUPLOAD_FILETYPE = 'File Type',
     IMAGEUPLOAD_IMAGESIZE = 'Image Size',

package/src/columns/constants/NUMERICAL_COLUMN.ts

@@ -0,0 +1,8 @@
+export enum NUMERICAL_COLUMN {
+    SLIDEBAR = 'SLIDEBAR',
+    NUMERIC = 'NUMERIC',
+    NUMERICC = 'NUMERIC-C',
+    NUMERICP = 'NUMERIC-P',
+    NUMERICG = 'NUMERIC-G',
+    RATING = 'RATING',
+}

package/src/columns/constants/NUMERICAL_COLUMNS.ts

@@ -0,0 +1,13 @@
+import { NUMERICAL_COLUMN } from "./NUMERICAL_COLUMN";
+
+/**
+ * @description Collection of numerical columns
+ */
+ export const NUMERICAL_COLUMNS = [
+	NUMERICAL_COLUMN.SLIDEBAR,
+	NUMERICAL_COLUMN.NUMERIC,
+	NUMERICAL_COLUMN.NUMERICC,
+	NUMERICAL_COLUMN.NUMERICG,
+    NUMERICAL_COLUMN.NUMERICP,
+    NUMERICAL_COLUMN.RATING,
+];

package/src/columns/constants/NUMERICAL_COLUMN_INFO.ts

@@ -0,0 +1,16 @@
+import { IColumnInfo } from "../interfaces/IColumnInfo";
+import { INumericalColumnType } from "../interfaces/INumericalColumnType";
+import { NUMERICAL_COLUMN } from "./NUMERICAL_COLUMN";
+import { NUMERICAL_COLUMN_LABEL } from "./NUMERICAL_COLUMN_LABEL";
+
+/**
+ * @description Key/array of numerical column info
+ */
+ export const NUMERICAL_COLUMN_INFO: { [key in INumericalColumnType]: IColumnInfo } = {
+    [NUMERICAL_COLUMN.SLIDEBAR]: { label: NUMERICAL_COLUMN_LABEL.SLIDEBAR, shortLabel: 'Slidebar', abbrLabel: 'Sldb', value: NUMERICAL_COLUMN.SLIDEBAR, displayed: true },
+    [NUMERICAL_COLUMN.NUMERIC]: { label: NUMERICAL_COLUMN_LABEL.NUMERIC, shortLabel: 'Num', abbrLabel: 'Num', value: NUMERICAL_COLUMN.NUMERIC, displayed: true },
+    [NUMERICAL_COLUMN.NUMERICC]: { label: NUMERICAL_COLUMN_LABEL.NUMERICC, shortLabel: 'Num-C', abbrLabel: 'NumC', value: NUMERICAL_COLUMN.NUMERICC, displayed: true },
+    [NUMERICAL_COLUMN.NUMERICP]: { label: NUMERICAL_COLUMN_LABEL.NUMERICP, shortLabel: 'Num-P', abbrLabel: 'NumP', value: NUMERICAL_COLUMN.NUMERICP, displayed: true },
+    [NUMERICAL_COLUMN.NUMERICG]: { label: NUMERICAL_COLUMN_LABEL.NUMERICG, shortLabel: 'Num-G', abbrLabel: 'NumG', value: NUMERICAL_COLUMN.NUMERICG, displayed: true },
+    [NUMERICAL_COLUMN.RATING]: { label: NUMERICAL_COLUMN_LABEL.RATING, shortLabel: 'Rating', abbrLabel: 'RTN', value: NUMERICAL_COLUMN.RATING, displayed: true },
+};

package/src/columns/constants/NUMERICAL_COLUMN_INFO_LIST.ts

@@ -0,0 +1,15 @@
+import { IColumnInfo } from "../interfaces/IColumnInfo";
+import { NUMERICAL_COLUMN } from "./NUMERICAL_COLUMN";
+import { NUMERICAL_COLUMN_INFO } from "./NUMERICAL_COLUMN_INFO";
+
+/**
+ * @description Key/array of numerical column info
+ */
+ export const NUMERICAL_COLUMN_INFO_LIST: IColumnInfo[] = [
+    NUMERICAL_COLUMN_INFO[NUMERICAL_COLUMN.SLIDEBAR],
+    NUMERICAL_COLUMN_INFO[NUMERICAL_COLUMN.NUMERIC],
+    NUMERICAL_COLUMN_INFO[NUMERICAL_COLUMN.NUMERICC],
+    NUMERICAL_COLUMN_INFO[NUMERICAL_COLUMN.NUMERICG],
+    NUMERICAL_COLUMN_INFO[NUMERICAL_COLUMN.NUMERICP],
+    NUMERICAL_COLUMN_INFO[NUMERICAL_COLUMN.RATING],
+];

package/src/columns/constants/NUMERICAL_COLUMN_LABEL.ts

@@ -0,0 +1,8 @@
+export enum NUMERICAL_COLUMN_LABEL {
+    SLIDEBAR = 'Slidebar',
+    NUMERIC = 'Numeric',
+	NUMERICC = 'Numeric-C',
+	NUMERICP = 'Numeric-P',
+	NUMERICG = 'Numeric-G',
+    RATING = 'Rating',
+}

package/src/columns/constants/index.ts

@@ -25,3 +25,9 @@ export * from './COMPOUND_COLUMN_PROPERTY_LABEL';
 export * from './COMPOUND_COLUMN_PROPERTY';
 export * from './COMPOUND_COLUMN';
 export * from './COMPOUND_COLUMNS';
+
+export * from './NUMERICAL_COLUMN_INFO_LIST';
+export * from './NUMERICAL_COLUMN_INFO';
+export * from './NUMERICAL_COLUMN_LABEL';
+export * from './NUMERICAL_COLUMN';
+export * from './NUMERICAL_COLUMNS';

package/src/columns/helpers/index.ts

@@ -1,2 +1,3 @@
 export * from './isComplexColumn';
 export * from './isDateColumn';
+export * from './isNumericalColumn';

package/src/columns/helpers/isNumericalColumn.ts

@@ -0,0 +1,7 @@
+import { isEmpty } from "../../general/mix/isEmpty";
+import { isObject } from "../../general/object/isObject";
+import { NUMERICAL_COLUMNS } from "../constants/NUMERICAL_COLUMNS";
+import { IColumn } from "../interfaces/IColumn";
+import { INumericalColumnType } from "../interfaces/INumericalColumnType";
+
+export const isNumericalColumn = (column: IColumn): boolean => !isEmpty(column) && isObject(column) && (NUMERICAL_COLUMNS.includes(column.type as INumericalColumnType) || column.formulaType === 'number');

package/src/columns/interfaces/IColumn.ts

@@ -1,16 +1,16 @@
-import { IColumnCalculationType } from "./IColumnCalculationType";
-import { IColumnAggregateType } from "./IColumnAggregateType";
+import { IColumnCalculationType } from "../../qrvey/interfaces/ICalculationType";
 import { IDataset } from "../../qrvey/interfaces/IDataset";
 import { IColumnPropertyType } from "./IColumnPropertyType";
 import { IColumnSortingSettings } from "./IColumnSortingSettings";
 import { IBColumn } from "./IBColumn";
+import { IAggregateType } from "../../charts/interfaces/IAggregateType";
 
 /**
  * Structure for columns used in the  App frontend side
  */
 export interface IColumn extends Omit<IBColumn, "text" | "bucketId" | "formulaId"> {
     bucketid?: string;
-    aggregate?: IColumnAggregateType;
+    aggregate?: IAggregateType;
     calculation?: IColumnCalculationType;
     dataset?: IDataset;
     formulaid?: string;

package/src/columns/interfaces/IColumnType.ts

@@ -1,6 +1,7 @@
 import { IComplexColumnType } from "./IComplexColumnType";
 import { ICompoundColumnType } from "./ICompoundColumnType";
 import { COLUMN } from "../constants/COLUMN";
+import { INumericalColumnType } from "./INumericalColumnType";
 
 // export type IColumnType = typeof COLUMN[keyof typeof COLUMN];
-export type IColumnType = COLUMN | ICompoundColumnType | IComplexColumnType;
+export type IColumnType = COLUMN | ICompoundColumnType | IComplexColumnType | INumericalColumnType;

package/src/columns/interfaces/INumericalColumnType.ts

@@ -0,0 +1,4 @@
+import { NUMERICAL_COLUMN } from "../constants/NUMERICAL_COLUMN";
+
+// export type INumericalColumnType = typeof NUMERICAL_COLUMN[keyof typeof NUMERICAL_COLUMN];
+export type INumericalColumnType = NUMERICAL_COLUMN;