Merge branch 'feature/table' of https://github.com/helsenorge/refero …

…into feature/table
helsenorge · Feb 20, 2024 · f986ac9 · f986ac9
2 parents 818029b + eecc2d6
commit f986ac9
Show file tree

Hide file tree

Showing 8 changed files with 1,041 additions and 37 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,9 @@
+## 14.1.0-beta03
+
+---
+
+- Bugfix: fix sorting of different itemtypes in tables, dates, quantity, string and numbers
+
 ## 14.1.0-beta02
 
 ---

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@helsenorge/refero",
-  "version": "14.1.0-beta02",
+  "version": "14.1.0-beta03",
   "engines": {
     "node": "^18.0.0",
     "npm": ">=9.0.0"

diff --git a/src/components/formcomponents/table/tables/gtable/interface.ts b/src/components/formcomponents/table/tables/gtable/interface.ts
@@ -21,4 +21,5 @@ export interface IGTableColumn {
   index: number;
   type?: IItemType;
   value: string;
+  rawValue?: string | number | boolean;
 }
diff --git a/src/components/formcomponents/table/tables/gtable/utils.ts b/src/components/formcomponents/table/tables/gtable/utils.ts
@@ -104,10 +104,13 @@ export const sortTableRows = (table: IGTable, columnIndex: number, sortOrder: So
 
       const aColumn = a.columns[columnIndex];
       const bColumn = b.columns[columnIndex];
-      const aValue = aColumn.value || '';
-      const bValue = bColumn.value || '';
+      if (!aColumn || !bColumn) {
+        return 0;
+      }
+      const aValue = aColumn?.value || '';
+      const bValue = bColumn?.value || '';
 
-      return sortByItemType(aValue, bValue, sortOrder, aColumn.type);
+      return sortByItemType(aValue, bValue, sortOrder, aColumn?.type);
     }),
   };
   return sortedTable;

diff --git a/src/components/formcomponents/table/tables/utils.ts b/src/components/formcomponents/table/tables/utils.ts
@@ -32,19 +32,21 @@ import {
   getResponseItemAndPathWithLinkId,
   isInGroupContext,
 } from '../../../../util/refero-core';
+type QuantityKeys = keyof Pick<Quantity, 'value' | 'code' | 'system' | 'unit'> | 'display';
+type Codingkeys = keyof Pick<Coding, 'code' | 'display' | 'system'>;
+type AttachmentKeys = keyof Pick<Attachment, 'data' | 'url' | 'title' | 'size' | 'contentType' | 'language' | 'id' | 'hash' | 'creation'>;
 
-function extractValueFromCoding(coding: Coding | undefined, field: keyof Pick<Coding, 'code' | 'display' | 'system'> = 'display'): string {
+function extractValueFromCoding(coding: Coding | undefined, field: Codingkeys = 'display'): string {
   if (!coding) return '';
   return coding[field] ?? '';
 }
-const extractValueFromQuantity = (
-  quantity: Quantity | undefined,
-  field: keyof Pick<Quantity, 'value' | 'code' | 'system' | 'unit'> = 'value'
-): string | number => {
+const extractValueFromQuantity = (quantity: Quantity | undefined, field: QuantityKeys): string | number => {
   if (!quantity) return '';
   switch (field) {
-    case 'value':
+    case 'display':
       return `${quantity.value ?? 0} ${quantity.unit ?? ''}`.replace(/'/g, '');
+    case 'value':
+      return quantity.value ?? 0;
     case 'unit':
       return quantity.unit ?? '';
     case 'system':
@@ -79,10 +81,8 @@ const extractValueFromDateTime = (inputValue?: string): string => {
   const date = parseDate(String(inputValue));
   return moment(date).locale('nb').format(DATEFORMATS.DATETIME);
 };
-export const extractValueFromAttachment = (
-  inputValue?: Attachment,
-  field: keyof Pick<Attachment, 'data' | 'url' | 'title' | 'size' | 'contentType' | 'language' | 'id' | 'hash' | 'creation'> = 'url'
-): string | number => {
+
+export const extractValueFromAttachment = (inputValue?: Attachment, field: AttachmentKeys = 'url'): string | number => {
   if (inputValue) {
     switch (field) {
       case 'data':
@@ -112,9 +112,30 @@ export const extractValueFromAttachment = (
   }
 };
 
-export const getPrimitiveValueFromItemType = (
-  type: typeof ItemType[keyof typeof ItemType],
-  res: QuestionnaireResponseItemAnswer
+/* Typeguards */
+function isQuantityKey(key?: string): key is QuantityKeys {
+  return ['value', 'code', 'system', 'unit', 'display'].includes(key ?? '');
+}
+function isCodingKey(key?: string): key is Codingkeys {
+  return ['code', 'display', 'system'].includes(key ?? '');
+}
+
+function isAttachmentKey(key?: string): key is AttachmentKeys {
+  return ['data', 'url', 'title', 'size', 'contentType', 'language', 'id', 'hash', 'creation'].includes(key ?? '');
+}
+
+type ItemTypeToDataTypeMap = {
+  Coding: Codingkeys;
+  Quantity: QuantityKeys;
+  Attachment: AttachmentKeys;
+};
+export const getPrimitiveValueFromItemType = <
+  ItemType extends keyof ItemTypeToDataTypeMap,
+  DisplayType extends ItemTypeToDataTypeMap[ItemType]
+>(
+  type: IItemType,
+  res: QuestionnaireResponseItemAnswer,
+  displayType?: DisplayType
 ): string | number | never => {
   switch (type) {
     case ItemType.STRING:
@@ -134,11 +155,11 @@ export const getPrimitiveValueFromItemType = (
       return extractValueFromTime(res.valueTime);
     case ItemType.CHOICE:
     case ItemType.OPENCHOICE:
-      return extractValueFromCoding(res.valueCoding, 'display');
+      return extractValueFromCoding(res.valueCoding, isCodingKey(displayType) ? displayType : 'display');
     case ItemType.QUANTITY:
-      return extractValueFromQuantity(res.valueQuantity);
+      return extractValueFromQuantity(res.valueQuantity, isQuantityKey(displayType) ? displayType : 'display');
     case ItemType.ATTATCHMENT:
-      return extractValueFromAttachment(res.valueAttachment, 'data');
+      return extractValueFromAttachment(res.valueAttachment, isAttachmentKey(displayType) ? displayType : 'data');
     default:
       return '';
   }
@@ -200,7 +221,7 @@ export const getValueIfDataReceiver = (
   const calculatedExpressionExtension = getCalculatedExpressionExtension(item);
   if (calculatedExpressionExtension) {
     if (questionnaireResponse) {
-      const res = getResponseItemAndPathWithLinkId(item.linkId, questionnaireResponse, []);
+      const res = getResponseItemAndPathWithLinkId(item.linkId, questionnaireResponse);
       return res[0].item.answer;
     }
     return undefined;
@@ -362,20 +383,43 @@ export function findCodeBySystem<T extends { system?: string }>(coding: T[], sys
 
 export const sortByItemType = (aValue: string, bValue: string, sortOrder: SortDirection, type?: IItemType): number => {
   switch (type) {
-    case 'date':
+    case ItemType.DATE:
       return compareDates(aValue, bValue, sortOrder);
-    case 'dateTime':
+    case ItemType.DATETIME:
       return compareDates(aValue, bValue, sortOrder);
-    case 'time':
+    case ItemType.TIME:
       return compareTimes(aValue, bValue, sortOrder);
-    case 'integer':
-    case 'decimal':
+    case ItemType.INTEGER:
+    case ItemType.DECIMAL:
       return compareNumbers(aValue, bValue, sortOrder);
+    case ItemType.QUANTITY:
+      return compareQuantities(aValue, bValue, sortOrder);
+    case ItemType.STRING:
+    case ItemType.TEXT:
+    case ItemType.OPENCHOICE:
+      return compareStrings(aValue, bValue, sortOrder);
     default:
-      return sortOrder === SortDirection.asc ? aValue.localeCompare(bValue) : bValue.localeCompare(aValue);
+      return compareStrings(aValue, bValue, sortOrder);
   }
 };
-function compareDates(aValue: string, bValue: string, sortOrder: SortDirection): number {
+
+const extractNumber = (value: string | undefined): number => {
+  if (!value) return 0;
+  const match = value.match(/\d+(\.\d+)?/);
+  return match ? parseFloat(match[0]) : 0;
+};
+
+const compareQuantities = (aValue: string | undefined, bValue: string | undefined, sortOrder: SortDirection): number => {
+  const numberA = extractNumber(aValue);
+  const numberB = extractNumber(bValue);
+  return sortOrder === SortDirection.asc ? numberA - numberB : numberB - numberA;
+};
+
+const compareStrings = (aValue: string, bValue: string, sortOrder: SortDirection): number => {
+  return sortOrder === SortDirection.asc ? aValue.localeCompare(bValue) : bValue.localeCompare(aValue);
+};
+
+const compareDates = (aValue: string, bValue: string, sortOrder: SortDirection): number => {
   const dateA = moment(aValue, DATEFORMATS.DATETIME);
   const dateB = moment(bValue, DATEFORMATS.DATETIME);
 
@@ -386,9 +430,9 @@ function compareDates(aValue: string, bValue: string, sortOrder: SortDirection):
     comparisonResult = 1;
   }
   return sortOrder === 'asc' ? comparisonResult : -comparisonResult;
-}
+};
 
-function compareTimes(aValue: string, bValue: string, sortOrder: SortDirection): number {
+const compareTimes = (aValue: string, bValue: string, sortOrder: SortDirection): number => {
   const format = DATEFORMATS.TIME;
   const timeA = moment(aValue, format);
   const timeB = moment(bValue, format);
@@ -398,10 +442,9 @@ function compareTimes(aValue: string, bValue: string, sortOrder: SortDirection):
   } else {
     return timeA.isAfter(timeB) ? -1 : timeA.isBefore(timeB) ? 1 : 0;
   }
-}
-
-function compareNumbers(aValue: string, bValue: string, sortOrder: SortDirection): number {
+};
+const compareNumbers = (aValue: string, bValue: string, sortOrder: SortDirection): number => {
   const numberA = parseFloat(aValue);
   const numberB = parseFloat(bValue);
   return sortOrder === SortDirection.asc ? numberA - numberB : numberB - numberA;
-}
+};
diff --git a/src/preview/FormFillerPreview.tsx b/src/preview/FormFillerPreview.tsx
@@ -10,7 +10,7 @@ import LanguageLocales from '@helsenorge/core-utils/constants/languages';
 import FormFillerSidebar from './FormFillerSidebar';
 import { emptyPropertyReplacer } from './helpers';
 import { getResources } from './resources/referoResources';
-import skjema from './skjema/NHNHelseopplysingerExtractTextOutput-nb-NO (3).json';
+import skjema from './skjema/NHN_Test_Repeterende_gtable-nb-NO-v0.1 (9).json';
 import { ReferoContainer } from '../components';
 import rootReducer from '../reducers';