@hedia/recommendation-screen 1.1.2 → 1.2.1

package/src/utils/AttentionMessages.d.ts

@@ -17,5 +17,5 @@ export declare class Messages {
     static InsulinKetones: () => string;
     static RecommendationWasLimited: () => string;
     static RecommendationWasLimitedActivity: (activityReduction: number) => string;
-    static InsulinWasLimitedActivity: (activityReduction?: number) => string;
+    static InsulinWasLimited: (activityReduction?: number) => string;
 }

package/src/utils/AttentionMessages.jsx

@@ -49,14 +49,15 @@ Messages.Reminder15Minutes = () => i18nUtils_1.i18n._(macro_1.t `You will be rem
 Messages.PostponePhysicalActivity = () => i18nUtils_1.i18n._(macro_1.t `If it is possible, postpone your planned exercise.`);
 Messages.HighBGL = () => i18nUtils_1.i18n._(macro_1.t `You have a high blood glucose level.`);
 Messages.InsulinKetones = () => i18nUtils_1.i18n._(macro_1.t `You should take rapid-acting insulin and measure ketones.`);
-Messages.RecommendationWasLimited = () => i18nUtils_1.i18n._(macro_1.t `Your recommendation would have been higher than ${Calculator.SAFETY_INSULIN_LIMIT} units of insulin, but it has been limited for safety reasons.`);
+Messages.RecommendationWasLimited = () => i18nUtils_1.i18n._(macro_1.t `Your recommendation would have been higher than ${Calculator.SAFETY_INSULIN_LIMIT} units of insulin, but it has been limited for safety reasons.
+			Hedia never recommends more than ${Calculator.SAFETY_INSULIN_LIMIT} units of insulin per calculation.`);
 Messages.RecommendationWasLimitedActivity = (activityReduction) => i18nUtils_1.i18n._(macro_1.t `Your recommendation would have been higher than ${getLimitedValue(activityReduction)}
 			units of insulin, but it has been limited for safety reasons.${`\n\n`}
 			Hedia never recommends more than ${Calculator.SAFETY_INSULIN_LIMIT}
 			units of insulin per calculation, but because of the physical activity
 			you entered it has been further reduced by ${(activityReduction * 100).toFixed(0)}% to
 			${getLimitedValue(activityReduction)}.`);
-Messages.InsulinWasLimitedActivity = (activityReduction) => activityReduction
-    ? i18nUtils_1.i18n._(macro_1.t `Hedia doesn't support more than ${Calculator.SAFETY_INSULIN_LIMIT} units of insulin per log, but because of the physical activity you entered it has been further reduced by
-			${(activityReduction * 100).toFixed(0)}% to ${getLimitedValue(activityReduction)} units for this log.`)
-    : i18nUtils_1.i18n._(macro_1.t `Your recommendation would have been higher than ${Calculator.SAFETY_INSULIN_LIMIT} units of insulin, but it has been limited for safety reasons.`);
+Messages.InsulinWasLimited = (activityReduction) => activityReduction
+    ? i18nUtils_1.i18n._(macro_1.t `Hedia doesn't support more than ${Calculator.SAFETY_INSULIN_LIMIT} units of insulin per calculation, but because of the physical activity you entered it has been further reduced by
+			${(activityReduction * 100).toFixed(0)}% to ${getLimitedValue(activityReduction)} units for this calculation.`)
+    : i18nUtils_1.i18n._(macro_1.t `Hedia does not support more than ${Calculator.SAFETY_INSULIN_LIMIT} units of insulin per calculation.`);

package/src/utils/AttentionMessages.tsx

@@ -34,7 +34,8 @@ export class Messages {
 	public static InsulinKetones = (): string => i18n._(t`You should take rapid-acting insulin and measure ketones.`);
 	public static RecommendationWasLimited = (): string =>
 		i18n._(
-			t`Your recommendation would have been higher than ${Calculator.SAFETY_INSULIN_LIMIT} units of insulin, but it has been limited for safety reasons.`,
+			t`Your recommendation would have been higher than ${Calculator.SAFETY_INSULIN_LIMIT} units of insulin, but it has been limited for safety reasons.
+			Hedia never recommends more than ${Calculator.SAFETY_INSULIN_LIMIT} units of insulin per calculation.`,
 		);
 	public static RecommendationWasLimitedActivity = (activityReduction: number): string =>
 		i18n._(
@@ -45,15 +46,15 @@ export class Messages {
 			you entered it has been further reduced by ${(activityReduction * 100).toFixed(0)}% to
 			${getLimitedValue(activityReduction)}.`,
 		);
-	public static InsulinWasLimitedActivity = (activityReduction?: number): string =>
+	public static InsulinWasLimited = (activityReduction?: number): string =>
 		activityReduction
 			? i18n._(
 					t`Hedia doesn't support more than ${
 						Calculator.SAFETY_INSULIN_LIMIT
-					} units of insulin per log, but because of the physical activity you entered it has been further reduced by
-			${(activityReduction * 100).toFixed(0)}% to ${getLimitedValue(activityReduction)} units for this log.`,
+					} units of insulin per calculation, but because of the physical activity you entered it has been further reduced by
+			${(activityReduction * 100).toFixed(0)}% to ${getLimitedValue(activityReduction)} units for this calculation.`,
 			  )
 			: i18n._(
-					t`Your recommendation would have been higher than ${Calculator.SAFETY_INSULIN_LIMIT} units of insulin, but it has been limited for safety reasons.`,
+					t`Hedia does not support more than ${Calculator.SAFETY_INSULIN_LIMIT} units of insulin per calculation.`,
 			  );
 }

package/src/utils/Constants.ts

@@ -3,6 +3,7 @@ import { IInterval } from "../types/types";
 export const BACKGROUND_COLOUR_PURPLE = `rgba(27, 31, 72, 1)`;
 export const BORDER_COLOUR_GREY = `rgba(74, 91, 134, 1)`;
 export const BORDER_COLOUR_TEAL = `rgba(1, 255, 252, 0.8)`;
+
 export const SEVERE_HYPERGLYCEMIA_START_MMOL = 15;
 
 export const FOUR_HOURS_SECONDS = 14400;

package/src/utils/RecommendationError.jsx

@@ -1,6 +1,26 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TimeoutLimitError = exports.UnitError = exports.LanguageError = exports.InjectionMethodError = exports.UserReminderError = exports.BolusInsulinSecondsPassedError = exports.BolusInsulinDosisError = exports.TargetBGLError = exports.CurrentBGLError = exports.InsulinToCarbsRatioError = exports.InsulinSensitivityError = exports.InsulinLimitError = exports.CarbohydrateLimitError = exports.ActivityTargetBGLError = exports.ActivityIntensityError = exports.ActivityDateError = exports.ActivityDurationError = exports.ActivitySettingsError = exports.RecommendationError = void 0;
+const Calculator = __importStar(require("@hedia/recommendation-calculator"));
 const macro_1 = require("@lingui/macro");
 const i18nUtils_1 = require("../locale/i18nUtils");
 const enum_1 = require("../types/enum");
@@ -18,14 +38,12 @@ exports.ActivityDateError = () => new RecommendationError(i18nUtils_1.i18n._(mac
 exports.ActivityIntensityError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support your activity intensity value`), enum_1.RecommendationErrorEnum.ActivityIntensity);
 exports.ActivityTargetBGLError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Please verify that your activity target blood glucose value is correct.`), enum_1.RecommendationErrorEnum.ActivityTargetBGL);
 exports.CarbohydrateLimitError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Hedia Calculator does not support insulin recommendations with more than 300 grams of carbohydrates present.`), enum_1.RecommendationErrorEnum.CarbohydrateLimit);
-exports.InsulinLimitError = (activityReduction) => new RecommendationError(activityReduction
-    ? AttentionMessages_1.Messages.InsulinWasLimitedActivity(activityReduction)
-    : AttentionMessages_1.Messages.InsulinWasLimitedActivity(), enum_1.RecommendationErrorEnum.InsulinLimit);
+exports.InsulinLimitError = (activityReduction) => new RecommendationError(activityReduction ? AttentionMessages_1.Messages.InsulinWasLimited(activityReduction) : AttentionMessages_1.Messages.InsulinWasLimited(), enum_1.RecommendationErrorEnum.InsulinLimit);
 exports.InsulinSensitivityError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Please verify that your insulin sensitivity value is correct.`), enum_1.RecommendationErrorEnum.InsulinSensitivity);
 exports.InsulinToCarbsRatioError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Please verify that your insulin to carb ratio value is correct.`), enum_1.RecommendationErrorEnum.InsulinToCarbsRatio);
 exports.CurrentBGLError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support your current blood glucose level.`), enum_1.RecommendationErrorEnum.CurrentBGL);
 exports.TargetBGLError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Please verify that your target blood glucose value is correct.`), enum_1.RecommendationErrorEnum.TargetBGL);
-exports.BolusInsulinDosisError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support an insulin dosis greater that 50 units`), enum_1.RecommendationErrorEnum.BolusInsulinDosis);
+exports.BolusInsulinDosisError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support an insulin dosis greater than ${Calculator.SAFETY_INSULIN_LIMIT} units`), enum_1.RecommendationErrorEnum.BolusInsulinDosis);
 exports.BolusInsulinSecondsPassedError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support insulin recommendations with boluses older than 4 hours`), enum_1.RecommendationErrorEnum.BolusInsulinSecondsPassed);
 exports.UserReminderError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Please verify your notifications settings.`), enum_1.RecommendationErrorEnum.UserReminder);
 exports.InjectionMethodError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support your injection method.`), enum_1.RecommendationErrorEnum.InjectionMethod);

package/src/utils/RecommendationError.tsx

@@ -1,3 +1,4 @@
+import * as Calculator from "@hedia/recommendation-calculator";
 import { t } from "@lingui/macro";
 import { i18n } from "../locale/i18nUtils";
 import { RecommendationErrorEnum } from "../types/enum";
@@ -52,9 +53,7 @@ export const CarbohydrateLimitError = (): RecommendationError =>
 
 export const InsulinLimitError = (activityReduction?: number): RecommendationError =>
 	new RecommendationError(
-		activityReduction
-			? Messages.InsulinWasLimitedActivity(activityReduction)
-			: Messages.InsulinWasLimitedActivity(),
+		activityReduction ? Messages.InsulinWasLimited(activityReduction) : Messages.InsulinWasLimited(),
 		RecommendationErrorEnum.InsulinLimit,
 	);
 
@@ -84,7 +83,9 @@ export const TargetBGLError = (): RecommendationError =>
 
 export const BolusInsulinDosisError = (): RecommendationError =>
 	new RecommendationError(
-		i18n._(t`Error. Hedia Calculator does not support an insulin dosis greater that 50 units`),
+		i18n._(
+			t`Error. Hedia Calculator does not support an insulin dosis greater than ${Calculator.SAFETY_INSULIN_LIMIT} units`,
+		),
 		RecommendationErrorEnum.BolusInsulinDosis,
 	);
 

package/App.jsx

@@ -1,94 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const RecommendationCalculator_1 = require("@hedia/recommendation-calculator/src/RecommendationCalculator");
-const react_1 = __importDefault(require("react"));
-const RecommendationScreen_1 = __importDefault(require("./src/RecommendationScreen"));
-const enum_1 = require("./src/types/enum");
-class App extends react_1.default.Component {
-    constructor(props) {
-        super(props);
-        this.exitCallback = (showRecentInsulin) => {
-            console.log(`Exiting...`, showRecentInsulin);
-        };
-        this.removeCarbs = () => {
-            this.setState({
-                carbs: null,
-            });
-        };
-        this.changeCarbs = (carbs) => {
-            this.setState({
-                carbs,
-            });
-        };
-        this.onYes = () => {
-            console.log(`Navigate to recent bolus screen`);
-        };
-        this.updatedRecommendedInsulin = (val) => {
-            console.log(`Updated recommended insulin: `, val);
-        };
-        this.transferToLogbook = (...params) => {
-            console.log(`Transfered:`, params);
-        };
-        this.updateRemeasureTime = (remeasureTime) => {
-            console.log(`updateRemeasureTime:`, remeasureTime);
-        };
-        this.recommendationAnswer = (carbRecommendationAnswer) => {
-            console.log("carbRecommendationAnswer", carbRecommendationAnswer);
-        };
-        this.handleError = (error) => {
-            console.log(JSON.stringify(error));
-            switch (error.type) {
-                default:
-                    throw error;
-            }
-        };
-        const params = {
-            currentBGL: 3,
-            carbohydrates: 120,
-            carbohydrateRatio: 22,
-            insulinSensitivity: 0.3,
-            targetBGL: 7,
-            recentBoluses: [],
-            activity: {
-                activityDate: new Date(Date.now() - enum_1.Milliseconds.Minute * 2),
-                activityDuration: 5,
-                activityIntensity: RecommendationCalculator_1.ActivityIntensity.Moderate,
-                activitySettings: {
-                    hard: { fromZero: 0.25, fromThirty: 0.55, fromFortysix: 0 },
-                    light: { fromZero: 0.25, fromThirty: 0.55, fromFortysix: 0.25 },
-                    post: { fromZero: 1, fromThirty: 0, fromFortysix: 0.25 },
-                    moderate: { fromZero: 0.25, fromThirty: 0.5, fromFortysix: 0.75 },
-                    target: 8.3,
-                },
-                activityTitle: `Moderate Activity Test Title`,
-            },
-        };
-        this.state = {
-            params,
-            carbs: 25,
-            injectionMethod: enum_1.InjectionMethod.Pump,
-        };
-    }
-    render() {
-        const logbook1 = {
-            blood_glucose_millimolar: 15,
-            carbohydrates_entered_grams: 25,
-            carbohydrates_suggested_grams: 25,
-            client_timestamp: `25`,
-            client_version: 25,
-            entry_timestamp: `25`,
-            event_uuid: null,
-            insulin_entered_units: 25,
-            insulin_suggested_units: 25,
-            is_deleted: null,
-            mood: 2,
-            settings_uuid: `25`,
-            uuid: `aaa`,
-        };
-        return (<RecommendationScreen_1.default latestLogbookFrom6Hours={logbook1} language={enum_1.Languages.en} injectionMethod={this.state.injectionMethod} calculatorParams={this.state.params} userReminder={5} units={enum_1.BGUnit.MMOL_L} exitCallback={this.exitCallback} onRecentInsulinYes={this.onYes} transferToLogbook={this.transferToLogbook} onError={this.handleError} carbRecommendationAnswer={this.recommendationAnswer} activityType={enum_1.ActivityEnum.Walk}/>);
-    }
-}
-exports.default = App;

package/src/components/HediaRecommendationModal.d.ts

@@ -1,26 +0,0 @@
-import * as React from "react";
-import { AttentionMessage } from "../utils/AttentionMessages";
-interface IModalProps {
-    isVisible: boolean;
-    suggestedCarbohydrates?: number;
-    attentionMessage: AttentionMessage;
-    limitationMessage: AttentionMessage;
-    onClickOkButton(): void;
-    onAcceptCarbohydrates(): void;
-    onDeclineCarbohydrates(): void;
-}
-interface IModalState {
-    firstPageVisible: boolean;
-}
-export default class HediaRecommendationModal extends React.Component<IModalProps, IModalState> {
-    constructor(props: IModalProps);
-    okayButton(): JSX.Element;
-    nextButton(): JSX.Element;
-    onPressNextButton: () => void;
-    recommendationButtons: () => JSX.Element;
-    recommendCarbohydrates: () => JSX.Element;
-    secondPage: () => JSX.Element;
-    firstPage: () => JSX.Element;
-    render(): JSX.Element;
-}
-export {};