fhir-dosage-utils 1.3.0 → 1.4.0

package/dist/locales/de/common.json

@@ -28,12 +28,15 @@
         "denominator_other": ":{{count}}"
       }
     },
-    "quantity": "{{quantity}} {{unit}}"
+    "quantity": {
+      "withUnit": "{{quantity}} {{unit}}",
+      "withoutUnit": "{{quantity}}"
+    }
   },
   "fields": {
-    "doseQuantity": "{{quantity}} {{unit}}",
+    "doseQuantity": "{{quantityText}}",
     "doseRange": "{{rangeText}}",
-    "rateQuantity": "mit einem Verhältnis von {{quantity}} {{unit}}",
+    "rateQuantity": "mit einem Verhältnis von {{quantityText}}",
     "rateRange": "mit einem Verhältnis von {{rangeText}}",
     "rateRatio": "mit einem Verhältnis von {{ratioText}}",
     "duration": "für {{durationText}}",
@@ -83,8 +86,8 @@
       "event_one": "{{event}}",
       "event_other": "{{event}}"
     },
-    "maxDosePerLifetime": "bis zu einer maximalen Menge von {{count}} {{unit}} über die Lebenszeit des Patienten",
-    "maxDosePerAdministration": "bis zu einer maximalen Menge von {{count}} {{unit}} pro Dosis",
+    "maxDosePerLifetime": "bis zu einer maximalen Menge von {{quantityText}} über die Lebenszeit des Patienten",
+    "maxDosePerAdministration": "bis zu einer maximalen Menge von {{quantityText}} pro Dosis",
     "maxDosePerPeriod": "bis zu einer maximalen Menge von {{maxDosePerPeriodText}}"
   }
 }

package/dist/locales/en/common.json

@@ -28,12 +28,15 @@
         "denominator_other": ":{{count}}"
       }
     },
-    "quantity": "{{quantity}} {{unit}}"
+    "quantity": {
+      "withUnit": "{{quantity}} {{unit}}",
+      "withoutUnit": "{{quantity}}"
+    }
   },
   "fields": {
-    "doseQuantity": "{{quantity}} {{unit}}",
+    "doseQuantity": "{{quantityText}}",
     "doseRange": "{{rangeText}}",
-    "rateQuantity": "at a rate of {{quantity}} {{unit}}",
+    "rateQuantity": "at a rate of {{quantityText}}",
     "rateRange": "at a rate of {{rangeText}}",
     "rateRatio": "at a rate of {{ratioText}}",
     "duration": "over {{durationText}}",
@@ -83,8 +86,8 @@
       "event_one": "on {{event}}",
       "event_other": "on {{event}}"
     },
-    "maxDosePerLifetime": "up to a maximum of {{count}} {{unit}} for the lifetime of patient",
-    "maxDosePerAdministration": "up to a maximum of {{count}} {{unit}} per dose",
+    "maxDosePerLifetime": "up to a maximum of {{quantityText}} for the lifetime of patient",
+    "maxDosePerAdministration": "up to a maximum of {{quantityText}} per dose",
     "maxDosePerPeriod": "up to a maximum of {{maxDosePerPeriodText}}"
   }
 }

package/dist/locales/fr/common.json

@@ -28,12 +28,15 @@
         "denominator_other": ":{{count}}"
       }
     },
-    "quantity": "{{quantity}} {{unit}}"
+    "quantity": {
+      "withUnit": "{{quantity}} {{unit}}",
+      "withoutUnit": "{{quantity}}"
+    }
   },
   "fields": {
-    "doseQuantity": "{{quantity}} {{unit}}",
+    "doseQuantity": "{{quantityText}}",
     "doseRange": "{{rangeText}}",
-    "rateQuantity": "au taux de {{quantity}} {{unit}}",
+    "rateQuantity": "au taux de {{quantityText}}",
     "rateRange": "au taux de {{rangeText}}",
     "rateRatio": "au taux de {{ratioText}}",
     "duration": "durant {{durationText}}",
@@ -83,8 +86,8 @@
       "event_one": "{{event}}",
       "event_other": "{{event}}"
     },
-    "maxDosePerLifetime": "jusqu'à un maximum de {{count}} {{unit}} pour la durée de vie du patient",
-    "maxDosePerAdministration": "jusqu'à un maximum de {{count}} {{unit}} par dose",
+    "maxDosePerLifetime": "jusqu'à un maximum de {{quantityText}} pour la durée de vie du patient",
+    "maxDosePerAdministration": "jusqu'à un maximum de {{quantityText}} par dose",
     "maxDosePerPeriod": "jusqu'à un maximum de {{maxDosePerPeriodText}}"
   }
 }

package/dist/locales/nl/common.json

@@ -28,12 +28,15 @@
         "denominator_other": ":{{count}}"
       }
     },
-    "quantity": "{{quantity}} {{unit}}"
+    "quantity": {
+      "withUnit": "{{quantity}} {{unit}}",
+      "withoutUnit": "{{quantity}}"
+    }
   },
   "fields": {
-    "doseQuantity": "{{quantity}} {{unit}}",
+    "doseQuantity": "{{quantityText}}",
     "doseRange": "{{rangeText}}",
-    "rateQuantity": "met een verhouding van {{quantity}} {{unit}}",
+    "rateQuantity": "met een verhouding van {{quantityText}}",
     "rateRange": "met een verhouding van {{rangeText}}",
     "rateRatio": "met een verhouding van {{ratioText}}",
     "duration": "gedurende {{durationText}}",
@@ -83,8 +86,8 @@
       "event_one": "{{event}}",
       "event_other": "{{event}}"
     },
-    "maxDosePerLifetime": "tot een maximum van {{count}} {{unit}} gedurende de levensduur van de patiënt",
-    "maxDosePerAdministration": "tot een maximum van {{count}} {{unit}} per dosis",
+    "maxDosePerLifetime": "tot een maximum van {{quantityText}} gedurende de levensduur van de patiënt",
+    "maxDosePerAdministration": "tot een maximum van {{quantityText}} per dosis",
     "maxDosePerPeriod": "tot een maximum van {{maxDosePerPeriodText}}"
   }
 }

package/dist/main.js

@@ -180,6 +180,7 @@ class $868b4eaa4f62b9f7$export$f807d9a22ff8372d {
 
 // translators
 // To avoid circular dependancies issue, let's have a single place for exports and imports
+// Functions
 // Types
 function $5461d5c8b4bc074f$export$76d408d587da5203(dos, key) {
     // If empty, return undefined
@@ -193,18 +194,39 @@ function $5461d5c8b4bc074f$export$76d408d587da5203(dos, key) {
 }
 
 
+// Function
+// Type
+function $6ce94eb09701f53d$export$e9106be159f8c977({ quantity: quantity, config: config, i18next: i18next }) {
+    // extract function for the unit display from config
+    const { fromFHIRQuantityUnitToString: fromFHIRQuantityUnitToString, language: language } = config;
+    // Compute the result
+    let unit = fromFHIRQuantityUnitToString({
+        language: language,
+        quantity: quantity
+    });
+    let value = quantity.value || 1;
+    // If no unit is present (in other words ""), we don't put it
+    if (unit.length === 0) return i18next.t("amount.quantity.withoutUnit", {
+        quantity: value
+    });
+    else return i18next.t("amount.quantity.withUnit", {
+        quantity: value,
+        unit: unit
+    });
+}
+
+
 function $5ab57a471c359130$export$7de3722258b87db9({ config: config, dos: dos, i18next: i18next }) {
     let doseQuantity = (0, $5461d5c8b4bc074f$export$76d408d587da5203)(dos, "doseQuantity");
     // If not found, skip
     if (doseQuantity === undefined) return undefined;
-    let quantity = doseQuantity.value || 1;
-    let unit = config.fromFHIRQuantityUnitToString({
-        language: config.language,
-        quantity: doseQuantity
-    });
+    // Otherwise rendering it
     return i18next.t("fields.doseQuantity", {
-        quantity: quantity,
-        unit: unit
+        quantityText: (0, $6ce94eb09701f53d$export$e9106be159f8c977)({
+            quantity: doseQuantity,
+            config: config,
+            i18next: i18next
+        })
     });
 }
 
@@ -278,21 +300,19 @@ function $9a073aa5b09aa778$export$4cd16590995531a9({ dos: dos, config: config, i
 }
 
 
+// Functions
+
 
 function $052c79abb28cba29$export$4e24ef8c7997cc56({ dos: dos, config: config, i18next: i18next }) {
     let rateQuantity = (0, $5461d5c8b4bc074f$export$76d408d587da5203)(dos, "rateQuantity");
     // If not found, skip
     if (rateQuantity === undefined) return undefined;
-    // information from rate
-    let value = rateQuantity.value || 1;
-    // quantity unit
-    let unit = config.fromFHIRQuantityUnitToString({
-        language: config.language,
-        quantity: rateQuantity
-    });
     return i18next.t("fields.rateQuantity", {
-        quantity: value,
-        unit: unit
+        quantityText: (0, $6ce94eb09701f53d$export$e9106be159f8c977)({
+            quantity: rateQuantity,
+            config: config,
+            i18next: i18next
+        })
     });
 }
 
@@ -338,8 +358,10 @@ function $7895e9944cc835ce$export$fdc6e9cbd31555fb({ ratio: ratio, config: confi
     // quantity
     let quantityNumerator = numerator?.value;
     let quantityDenominator = denominator?.value;
-    // Collect
+    // Collect results
     const parts = [];
+    let noUnits = numeratorUnit === undefined && denominatorUnit === undefined;
+    let separator = noUnits ? "" : " ";
     // Deal with numerator first
     if (quantityNumerator !== undefined) {
         let technicalKey = numeratorUnit !== undefined ? "withUnit" : "withoutUnit";
@@ -360,7 +382,7 @@ function $7895e9944cc835ce$export$fdc6e9cbd31555fb({ ratio: ratio, config: confi
     }
     // Concatenate the result
     if (parts.length === 0) return undefined;
-    else return parts.join(" ");
+    else return parts.join(separator);
 }
 
 
@@ -872,34 +894,34 @@ function $6c156f35df44ca41$export$21e3522d6e713036({ dos: dos, config: config, i
 }
 
 
-// types
+// Functions
+
 function $e021f207f5cc63d0$export$6e78f21a88fc25ea({ dos: dos, config: config, i18next: i18next }) {
     // If empty, return undefined
     if (dos.maxDosePerLifetime === undefined) return undefined;
     const maxDosePerLifetime = dos.maxDosePerLifetime;
-    let unit = config.fromFHIRQuantityUnitToString({
-        language: config.language,
-        quantity: maxDosePerLifetime
-    });
     return i18next.t("fields.maxDosePerLifetime", {
-        count: maxDosePerLifetime.value || 1,
-        unit: unit
+        quantityText: (0, $6ce94eb09701f53d$export$e9106be159f8c977)({
+            quantity: maxDosePerLifetime,
+            config: config,
+            i18next: i18next
+        })
     });
 }
 
 
-// types
+// Functions
+
 function $9ad44f2c84a9bdf4$export$58c8a9e040283a66({ dos: dos, config: config, i18next: i18next }) {
     // If empty, return undefined
     if (dos.maxDosePerAdministration === undefined) return undefined;
     const maxDosePerAdministration = dos.maxDosePerAdministration;
-    let unit = config.fromFHIRQuantityUnitToString({
-        language: config.language,
-        quantity: maxDosePerAdministration
-    });
     return i18next.t("fields.maxDosePerAdministration", {
-        count: maxDosePerAdministration.value || 1,
-        unit: unit
+        quantityText: (0, $6ce94eb09701f53d$export$e9106be159f8c977)({
+            quantity: maxDosePerAdministration,
+            config: config,
+            i18next: i18next
+        })
     });
 }