@hedia/recommendation-screen 1.2.1 → 1.3.0

package/src/components/RecommendedCarbs.tsx

@@ -1,9 +1,9 @@
 import { t } from "@lingui/macro";
 import React from "react";
-import { Dimensions, StyleSheet, Text, TouchableOpacity, View } from "react-native";
+import { Alert, Dimensions, StyleSheet, Text, TouchableOpacity, View } from "react-native";
 import { i18n } from "../locale/i18nUtils";
 import { BORDER_COLOUR_TEAL } from "../utils/Constants";
-import { CarbohydrateLimitError, RecommendationError } from "../utils/RecommendationError";
+import { CarbohydrateLimitError } from "../utils/RecommendationError";
 import Icon from "./Icon";
 import { infoStyles } from "./InfoBars";
 import InvisibleNumberInput from "./InvisibleNumberInput";
@@ -23,7 +23,6 @@ interface IProps {
 	// Callbacks
 	removeRecommendedCarbs(): void;
 	changedRecommendedCarbs(value: number): void;
-	onError(error: RecommendationError): void;
 }
 
 interface IState {
@@ -50,7 +49,12 @@ export default class RecommendedCarbs extends React.Component<IProps, IState> {
 	public handleChangedCarbs = (carbs: number): void => {
 		if (carbs >= 0) {
 			if (carbs > 300) {
-				return this.props.onError(CarbohydrateLimitError());
+				this.setState({ partialInput: this.props.recommendedCarbs });
+				return Alert.alert(i18n._(`Attention`), CarbohydrateLimitError().message, [
+					{
+						text: i18n._(`OK`),
+					},
+				]);
 			}
 			this.props.changedRecommendedCarbs(carbs);
 		}
@@ -58,7 +62,7 @@ export default class RecommendedCarbs extends React.Component<IProps, IState> {
 
 	public renderRecommendedCarbs = (): JSX.Element => {
 		const shownCarbs = this.state.partialInput ?? Math.round(Number(this.props.recommendedCarbs));
-		const totalCarbs = Math.round(parseFloat(this.props.enteredCarbs) + parseFloat(this.props.recommendedCarbs));
+		const totalCarbs = Math.round(parseFloat(this.props.enteredCarbs) + Number(shownCarbs));
 		return (
 			<React.Fragment>
 				<View style={calculationStyles.borderContainer}>
@@ -114,6 +118,7 @@ export default class RecommendedCarbs extends React.Component<IProps, IState> {
 					partialInput={this.handlePartialInput}
 					onEnd={this.handleChangedCarbs}
 					startValue={this.props.recommendedCarbs}
+					maxLength={3}
 				/>
 			</React.Fragment>
 		);

package/src/components/RecommendedInsulin.d.ts

@@ -1,19 +1,19 @@
 import React from "react";
 import { InjectionMethod } from "../types/enum";
-import { RecommendationError } from "../utils/RecommendationError";
 interface IProps {
     insulinRecommendation?: number;
+    enteredInsulin?: number;
     activityReduction?: number;
     injectionMethod: InjectionMethod;
     updateRecommendedInsulin(value: number): void;
-    onError(error: RecommendationError): void;
 }
 interface IState {
-    insulin: string;
+    partialInput: string;
 }
 export default class RecommendedInsulin extends React.Component<IProps, IState> {
     callbackInput: () => void;
     constructor(props: IProps);
+    componentDidUpdate(prevProps: IProps): void;
     handleOnPress: () => void;
     updatePartially: (insulin: string) => string;
     handleUpdatedInsulin: (value: number) => void;

package/src/components/RecommendedInsulin.jsx

@@ -9,7 +9,7 @@ const react_1 = __importDefault(require("react"));
 const react_native_1 = require("react-native");
 const react_native_linear_gradient_1 = __importDefault(require("react-native-linear-gradient"));
 const i18nUtils_1 = require("../locale/i18nUtils");
-const RecommendationError_1 = require("../utils/RecommendationError");
+const AttentionMessages_1 = require("../utils/AttentionMessages");
 const Utils_1 = require("../utils/Utils");
 const Icon_1 = __importDefault(require("./Icon"));
 const InfoBars_1 = require("./InfoBars");
@@ -23,7 +23,7 @@ class RecommendedInsulin extends react_1.default.Component {
         this.updatePartially = (insulin) => {
             const replacedZero = insulin.length > 1 && insulin.startsWith(`0`) && !insulin.startsWith(`0.`) ? insulin.substring(1) : insulin;
             this.setState({
-                insulin: replacedZero,
+                partialInput: replacedZero,
             });
             return replacedZero;
         };
@@ -33,13 +33,18 @@ class RecommendedInsulin extends react_1.default.Component {
             const limited = (1 - this.props.activityReduction) * recommendation_calculator_1.SAFETY_INSULIN_LIMIT;
             if (rounded > limited) {
                 this.updatePartially(`${limited}`);
-                return this.props.onError(RecommendationError_1.InsulinLimitError(this.props.activityReduction));
+                return react_native_1.Alert.alert(i18nUtils_1.i18n._(`Attention`), AttentionMessages_1.Messages.InsulinInputWasLimited(this.props.activityReduction), [
+                    {
+                        text: i18nUtils_1.i18n._(`OK`),
+                    },
+                ]);
             }
             this.updatePartially(`${rounded}`);
             this.props.updateRecommendedInsulin(rounded);
         };
         this.render = () => {
             const paddingBottom = react_native_1.Platform.OS === `ios` ? `3%` : `1%`;
+            const shownInsulin = this.state.partialInput ?? this.props.insulinRecommendation ?? `0`;
             return (<react_1.default.Fragment>
 				<react_native_1.TouchableOpacity accessibilityLabel="editRecommendedInsulin" onPress={this.handleOnPress}>
 					<react_native_linear_gradient_1.default style={recommendedInsulinStyles.container} colors={[`#a200ff`, `#578aff`]} start={{ x: 0, y: 0 }} end={{ x: 1, y: 0 }}>
@@ -50,20 +55,26 @@ class RecommendedInsulin extends react_1.default.Component {
 						</react_native_1.View>
 						<react_native_1.View style={[recommendedInsulinStyles.recommendedContainer, { paddingBottom }]}>
 							<react_native_1.View style={recommendedInsulinStyles.valueContainer}>
-								<react_native_1.Text style={recommendedInsulinStyles.value}>{this.state.insulin}</react_native_1.Text>
+								<react_native_1.Text style={recommendedInsulinStyles.value}>{shownInsulin}</react_native_1.Text>
 								<react_native_1.Text style={recommendedInsulinStyles.units}>{i18nUtils_1.i18n._(macro_1.t `Units`)}</react_native_1.Text>
 							</react_native_1.View>
 							<Icon_1.default style={recommendedInsulinStyles.editIcon} iconIdentifier={`Feather/edit`}/>
 						</react_native_1.View>
 					</react_native_linear_gradient_1.default>
 				</react_native_1.TouchableOpacity>
-				<InvisibleNumberInput_1.default decimalPlaces={3} negativeAllowed={false} cleanPartialInput={false} partialInput={this.updatePartially} onEnd={this.handleUpdatedInsulin} visible={(visible) => (this.callbackInput = visible)} startValue={`${this.state.insulin}`}/>
+				<InvisibleNumberInput_1.default decimalPlaces={3} negativeAllowed={false} cleanPartialInput={false} partialInput={this.updatePartially} onEnd={this.handleUpdatedInsulin} visible={(visible) => (this.callbackInput = visible)} startValue={`${shownInsulin}`}/>
 			</react_1.default.Fragment>);
         };
         this.state = {
-            insulin: `${props.insulinRecommendation ?? 0}`,
+            partialInput: null,
         };
     }
+    componentDidUpdate(prevProps) {
+        const { enteredInsulin } = this.props;
+        if (prevProps.enteredInsulin !== enteredInsulin) {
+            this.setState({ partialInput: enteredInsulin?.toString() });
+        }
+    }
 }
 exports.default = RecommendedInsulin;
 const recommendedInsulinStyles = react_native_1.StyleSheet.create({
@@ -90,6 +101,7 @@ const recommendedInsulinStyles = react_native_1.StyleSheet.create({
         flex: 1,
         flexDirection: `row`,
         justifyContent: `center`,
+        minHeight: react_native_1.Dimensions.get(`screen`).width / 4,
     },
     value: {
         color: `white`,

package/src/components/RecommendedInsulin.tsx

@@ -1,28 +1,29 @@
 import { SAFETY_INSULIN_LIMIT } from "@hedia/recommendation-calculator";
 import { t } from "@lingui/macro";
 import React from "react";
-import { Dimensions, Platform, StyleSheet, Text, TouchableOpacity, View } from "react-native";
+import { Alert, Dimensions, Platform, StyleSheet, Text, TouchableOpacity, View } from "react-native";
 import LinearGradient from "react-native-linear-gradient";
 import { i18n } from "../locale/i18nUtils";
 import { InjectionMethod } from "../types/enum";
-import { InsulinLimitError, RecommendationError } from "../utils/RecommendationError";
+import { Messages } from "../utils/AttentionMessages";
 import { Utils } from "../utils/Utils";
 import Icon from "./Icon";
 import { infoStyles } from "./InfoBars";
 import InvisibleNumberInput from "./InvisibleNumberInput";
 
 interface IProps {
+	// Values
 	insulinRecommendation?: number;
+	enteredInsulin?: number;
 	activityReduction?: number;
-
 	injectionMethod: InjectionMethod;
 
+	// Callbacks
 	updateRecommendedInsulin(value: number): void;
-	onError(error: RecommendationError): void;
 }
 
 interface IState {
-	insulin: string;
+	partialInput: string;
 }
 
 export default class RecommendedInsulin extends React.Component<IProps, IState> {
@@ -32,10 +33,17 @@ export default class RecommendedInsulin extends React.Component<IProps, IState>
 		super(props);
 
 		this.state = {
-			insulin: `${props.insulinRecommendation ?? 0}`,
+			partialInput: null,
 		};
 	}
 
+	public componentDidUpdate(prevProps: IProps): void {
+		const { enteredInsulin } = this.props;
+		if (prevProps.enteredInsulin !== enteredInsulin) {
+			this.setState({ partialInput: enteredInsulin?.toString() });
+		}
+	}
+
 	public handleOnPress = (): void => {
 		this.callbackInput?.();
 	};
@@ -44,7 +52,7 @@ export default class RecommendedInsulin extends React.Component<IProps, IState>
 		const replacedZero =
 			insulin.length > 1 && insulin.startsWith(`0`) && !insulin.startsWith(`0.`) ? insulin.substring(1) : insulin;
 		this.setState({
-			insulin: replacedZero,
+			partialInput: replacedZero,
 		});
 		return replacedZero;
 	};
@@ -57,7 +65,11 @@ export default class RecommendedInsulin extends React.Component<IProps, IState>
 
 		if (rounded > limited) {
 			this.updatePartially(`${limited}`);
-			return this.props.onError(InsulinLimitError(this.props.activityReduction));
+			return Alert.alert(i18n._(`Attention`), Messages.InsulinInputWasLimited(this.props.activityReduction), [
+				{
+					text: i18n._(`OK`),
+				},
+			]);
 		}
 
 		this.updatePartially(`${rounded}`);
@@ -66,6 +78,7 @@ export default class RecommendedInsulin extends React.Component<IProps, IState>
 
 	public render = (): JSX.Element => {
 		const paddingBottom = Platform.OS === `ios` ? `3%` : `1%`;
+		const shownInsulin = this.state.partialInput ?? this.props.insulinRecommendation ?? `0`;
 		return (
 			<React.Fragment>
 				<TouchableOpacity accessibilityLabel="editRecommendedInsulin" onPress={this.handleOnPress}>
@@ -82,7 +95,7 @@ export default class RecommendedInsulin extends React.Component<IProps, IState>
 						</View>
 						<View style={[recommendedInsulinStyles.recommendedContainer, { paddingBottom }]}>
 							<View style={recommendedInsulinStyles.valueContainer}>
-								<Text style={recommendedInsulinStyles.value}>{this.state.insulin}</Text>
+								<Text style={recommendedInsulinStyles.value}>{shownInsulin}</Text>
 								<Text style={recommendedInsulinStyles.units}>{i18n._(t`Units`)}</Text>
 							</View>
 							<Icon style={recommendedInsulinStyles.editIcon} iconIdentifier={`Feather/edit`} />
@@ -96,7 +109,7 @@ export default class RecommendedInsulin extends React.Component<IProps, IState>
 					partialInput={this.updatePartially}
 					onEnd={this.handleUpdatedInsulin}
 					visible={(visible): (() => void) => (this.callbackInput = visible)}
-					startValue={`${this.state.insulin}`}
+					startValue={`${shownInsulin}`}
 				/>
 			</React.Fragment>
 		);
@@ -127,6 +140,7 @@ const recommendedInsulinStyles = StyleSheet.create({
 		flex: 1,
 		flexDirection: `row`,
 		justifyContent: `center`,
+		minHeight: Dimensions.get(`screen`).width / 4,
 	},
 	value: {
 		color: `white`,

package/src/components/activity/ActivityIcon.jsx

@@ -27,7 +27,7 @@ class ActivityIcon extends react_1.default.Component {
         const label = `${enum_1.ActivityEnum[activityType]}_activity`;
         return (<react_native_1.View style={activityIconStyles.container}>
 				<react_native_1.Image style={activityIconStyles.activityIcon} source={this.getActivityIcon()} accessibilityLabel={label}/>
-				<react_native_1.Text style={activityIconStyles.activityTitle}>{activityTitle ?? i18nUtils_1.i18n._(macro_1.t `Untitled Activity`)}</react_native_1.Text>
+				<react_native_1.Text style={activityIconStyles.activityTitle}>{activityTitle || i18nUtils_1.i18n._(macro_1.t `Untitled Activity`)}</react_native_1.Text>
 			</react_native_1.View>);
     }
 }

package/src/components/activity/ActivityIcon.tsx

@@ -28,7 +28,7 @@ export default class ActivityIcon extends React.Component<IActivityType & IActiv
 					source={this.getActivityIcon()}
 					accessibilityLabel={label}
 				/>
-				<Text style={activityIconStyles.activityTitle}>{activityTitle ?? i18n._(t`Untitled Activity`)}</Text>
+				<Text style={activityIconStyles.activityTitle}>{activityTitle || i18n._(t`Untitled Activity`)}</Text>
 			</View>
 		);
 	}

package/src/types/enum.d.ts

@@ -39,16 +39,15 @@ export declare enum RecommendationErrorEnum {
     BolusInsulinDosis = 5,
     BolusInsulinSecondsPassed = 6,
     CarbohydrateLimit = 7,
-    InsulinLimit = 8,
-    InsulinSensitivity = 9,
-    InsulinToCarbsRatio = 10,
-    CurrentBGL = 11,
-    TargetBGL = 12,
-    UserReminder = 13,
-    Language = 14,
-    InjectionMethod = 15,
-    Unit = 16,
-    TimeoutLimit = 17
+    InsulinSensitivity = 8,
+    InsulinToCarbsRatio = 9,
+    CurrentBGL = 10,
+    TargetBGL = 11,
+    UserReminder = 12,
+    Language = 13,
+    InjectionMethod = 14,
+    Unit = 15,
+    TimeoutLimit = 16
 }
 export declare enum Milliseconds {
     Second = 1000,

package/src/types/enum.js

@@ -49,16 +49,15 @@ var RecommendationErrorEnum;
     RecommendationErrorEnum[RecommendationErrorEnum["BolusInsulinDosis"] = 5] = "BolusInsulinDosis";
     RecommendationErrorEnum[RecommendationErrorEnum["BolusInsulinSecondsPassed"] = 6] = "BolusInsulinSecondsPassed";
     RecommendationErrorEnum[RecommendationErrorEnum["CarbohydrateLimit"] = 7] = "CarbohydrateLimit";
-    RecommendationErrorEnum[RecommendationErrorEnum["InsulinLimit"] = 8] = "InsulinLimit";
-    RecommendationErrorEnum[RecommendationErrorEnum["InsulinSensitivity"] = 9] = "InsulinSensitivity";
-    RecommendationErrorEnum[RecommendationErrorEnum["InsulinToCarbsRatio"] = 10] = "InsulinToCarbsRatio";
-    RecommendationErrorEnum[RecommendationErrorEnum["CurrentBGL"] = 11] = "CurrentBGL";
-    RecommendationErrorEnum[RecommendationErrorEnum["TargetBGL"] = 12] = "TargetBGL";
-    RecommendationErrorEnum[RecommendationErrorEnum["UserReminder"] = 13] = "UserReminder";
-    RecommendationErrorEnum[RecommendationErrorEnum["Language"] = 14] = "Language";
-    RecommendationErrorEnum[RecommendationErrorEnum["InjectionMethod"] = 15] = "InjectionMethod";
-    RecommendationErrorEnum[RecommendationErrorEnum["Unit"] = 16] = "Unit";
-    RecommendationErrorEnum[RecommendationErrorEnum["TimeoutLimit"] = 17] = "TimeoutLimit";
+    RecommendationErrorEnum[RecommendationErrorEnum["InsulinSensitivity"] = 8] = "InsulinSensitivity";
+    RecommendationErrorEnum[RecommendationErrorEnum["InsulinToCarbsRatio"] = 9] = "InsulinToCarbsRatio";
+    RecommendationErrorEnum[RecommendationErrorEnum["CurrentBGL"] = 10] = "CurrentBGL";
+    RecommendationErrorEnum[RecommendationErrorEnum["TargetBGL"] = 11] = "TargetBGL";
+    RecommendationErrorEnum[RecommendationErrorEnum["UserReminder"] = 12] = "UserReminder";
+    RecommendationErrorEnum[RecommendationErrorEnum["Language"] = 13] = "Language";
+    RecommendationErrorEnum[RecommendationErrorEnum["InjectionMethod"] = 14] = "InjectionMethod";
+    RecommendationErrorEnum[RecommendationErrorEnum["Unit"] = 15] = "Unit";
+    RecommendationErrorEnum[RecommendationErrorEnum["TimeoutLimit"] = 16] = "TimeoutLimit";
 })(RecommendationErrorEnum = exports.RecommendationErrorEnum || (exports.RecommendationErrorEnum = {}));
 var Milliseconds;
 (function (Milliseconds) {

package/src/types/enum.ts

@@ -44,7 +44,6 @@ export enum RecommendationErrorEnum {
 	BolusInsulinDosis,
 	BolusInsulinSecondsPassed,
 	CarbohydrateLimit,
-	InsulinLimit,
 	InsulinSensitivity,
 	InsulinToCarbsRatio,
 	CurrentBGL,

package/src/types/types.ts

@@ -22,6 +22,7 @@ export interface logbookEntry {
 	is_deleted: Date | null;
 	utc_timezone_offset?: string | null;
 }
+
 export interface IInterval {
 	min: number;
 	max: number;

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 InsulinWasLimited: (activityReduction?: number) => string;
+    static InsulinInputWasLimited: (activityReduction?: number) => string;
 }

package/src/utils/AttentionMessages.jsx

@@ -57,7 +57,7 @@ Messages.RecommendationWasLimitedActivity = (activityReduction) => i18nUtils_1.i
 			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.InsulinWasLimited = (activityReduction) => activityReduction
+Messages.InsulinInputWasLimited = (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

@@ -46,7 +46,7 @@ export class Messages {
 			you entered it has been further reduced by ${(activityReduction * 100).toFixed(0)}% to
 			${getLimitedValue(activityReduction)}.`,
 		);
-	public static InsulinWasLimited = (activityReduction?: number): string =>
+	public static InsulinInputWasLimited = (activityReduction?: number): string =>
 		activityReduction
 			? i18n._(
 					t`Hedia doesn't support more than ${

package/src/utils/Constants.d.ts

@@ -5,6 +5,7 @@ export declare const BORDER_COLOUR_TEAL = "rgba(1, 255, 252, 0.8)";
 export declare const SEVERE_HYPERGLYCEMIA_START_MMOL = 15;
 export declare const FOUR_HOURS_SECONDS = 14400;
 export declare const ONE_HOUR_MINUTES = 60;
+export declare const ACTIVITY_BUFFER_MINUTES = 10;
 export declare const CARBOHYDRATES_LIMTS: IInterval;
 export declare const INSULIN_DOSIS_LIMITS: IInterval;
 export declare const BOLUS_SECONDS_PASSED_LIMITS: IInterval;
@@ -12,6 +13,8 @@ export declare const ACTIVITY_DURATION_MINUTES_LIMITS: IInterval;
 export declare const INSULIN_SENSITIVITY_MMOL_LIMITS: IInterval;
 export declare const INSULIN_TO_CARBS_RATIO_LIMITS: IInterval;
 export declare const CURRENT_BGL_MMOL_LIMITS: IInterval;
+export declare const MMOLL_PER_MGDL: number;
+export declare const MGDL_PER_MMOLL: number;
 export declare const TARGET_BGL_MMOL_LIMITS: IInterval;
 export declare const ACTIVITY_TARGET_BGL_MMOL_LIMITS: IInterval;
 export declare const REMINDER_HOURS_LIMITS: IInterval;

package/src/utils/Constants.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ACTIVITY_SETTINGS_INTERVAL_LIMITS = exports.REMINDER_HOURS_LIMITS = exports.ACTIVITY_TARGET_BGL_MMOL_LIMITS = exports.TARGET_BGL_MMOL_LIMITS = exports.CURRENT_BGL_MMOL_LIMITS = exports.INSULIN_TO_CARBS_RATIO_LIMITS = exports.INSULIN_SENSITIVITY_MMOL_LIMITS = exports.ACTIVITY_DURATION_MINUTES_LIMITS = exports.BOLUS_SECONDS_PASSED_LIMITS = exports.INSULIN_DOSIS_LIMITS = exports.CARBOHYDRATES_LIMTS = exports.ONE_HOUR_MINUTES = exports.FOUR_HOURS_SECONDS = exports.SEVERE_HYPERGLYCEMIA_START_MMOL = exports.BORDER_COLOUR_TEAL = exports.BORDER_COLOUR_GREY = exports.BACKGROUND_COLOUR_PURPLE = void 0;
+exports.ACTIVITY_SETTINGS_INTERVAL_LIMITS = exports.REMINDER_HOURS_LIMITS = exports.ACTIVITY_TARGET_BGL_MMOL_LIMITS = exports.TARGET_BGL_MMOL_LIMITS = exports.MGDL_PER_MMOLL = exports.MMOLL_PER_MGDL = exports.CURRENT_BGL_MMOL_LIMITS = exports.INSULIN_TO_CARBS_RATIO_LIMITS = exports.INSULIN_SENSITIVITY_MMOL_LIMITS = exports.ACTIVITY_DURATION_MINUTES_LIMITS = exports.BOLUS_SECONDS_PASSED_LIMITS = exports.INSULIN_DOSIS_LIMITS = exports.CARBOHYDRATES_LIMTS = exports.ACTIVITY_BUFFER_MINUTES = exports.ONE_HOUR_MINUTES = exports.FOUR_HOURS_SECONDS = exports.SEVERE_HYPERGLYCEMIA_START_MMOL = exports.BORDER_COLOUR_TEAL = exports.BORDER_COLOUR_GREY = exports.BACKGROUND_COLOUR_PURPLE = void 0;
 exports.BACKGROUND_COLOUR_PURPLE = `rgba(27, 31, 72, 1)`;
 exports.BORDER_COLOUR_GREY = `rgba(74, 91, 134, 1)`;
 exports.BORDER_COLOUR_TEAL = `rgba(1, 255, 252, 0.8)`;
 exports.SEVERE_HYPERGLYCEMIA_START_MMOL = 15;
 exports.FOUR_HOURS_SECONDS = 14400;
 exports.ONE_HOUR_MINUTES = 60;
+exports.ACTIVITY_BUFFER_MINUTES = 10;
 exports.CARBOHYDRATES_LIMTS = { min: 0, max: 300 };
 exports.INSULIN_DOSIS_LIMITS = { min: 0, max: 50 };
 exports.BOLUS_SECONDS_PASSED_LIMITS = { min: 0, max: exports.FOUR_HOURS_SECONDS };
@@ -14,6 +15,8 @@ exports.ACTIVITY_DURATION_MINUTES_LIMITS = { min: 1, max: exports.ONE_HOUR_MINUT
 exports.INSULIN_SENSITIVITY_MMOL_LIMITS = { min: 0.3, max: 10 };
 exports.INSULIN_TO_CARBS_RATIO_LIMITS = { min: 1, max: 50 };
 exports.CURRENT_BGL_MMOL_LIMITS = { min: 1.1, max: 33.3 };
+exports.MMOLL_PER_MGDL = 0.0555;
+exports.MGDL_PER_MMOLL = 1 / exports.MMOLL_PER_MGDL;
 exports.TARGET_BGL_MMOL_LIMITS = { min: 5, max: 13.9 };
 exports.ACTIVITY_TARGET_BGL_MMOL_LIMITS = { min: 5, max: 13.9 };
 exports.REMINDER_HOURS_LIMITS = { min: 0, max: 6 };

package/src/utils/Constants.ts

@@ -8,6 +8,8 @@ export const SEVERE_HYPERGLYCEMIA_START_MMOL = 15;
 
 export const FOUR_HOURS_SECONDS = 14400;
 export const ONE_HOUR_MINUTES = 60;
+export const ACTIVITY_BUFFER_MINUTES = 10;
+
 export const CARBOHYDRATES_LIMTS: IInterval = { min: 0, max: 300 };
 export const INSULIN_DOSIS_LIMITS: IInterval = { min: 0, max: 50 };
 export const BOLUS_SECONDS_PASSED_LIMITS: IInterval = { min: 0, max: FOUR_HOURS_SECONDS };
@@ -17,6 +19,9 @@ export const INSULIN_SENSITIVITY_MMOL_LIMITS: IInterval = { min: 0.3, max: 10 };
 export const INSULIN_TO_CARBS_RATIO_LIMITS: IInterval = { min: 1, max: 50 };
 
 export const CURRENT_BGL_MMOL_LIMITS: IInterval = { min: 1.1, max: 33.3 };
+export const MMOLL_PER_MGDL: number = 0.0555;
+export const MGDL_PER_MMOLL: number = 1 / MMOLL_PER_MGDL;
+
 export const TARGET_BGL_MMOL_LIMITS: IInterval = { min: 5, max: 13.9 };
 export const ACTIVITY_TARGET_BGL_MMOL_LIMITS: IInterval = { min: 5, max: 13.9 };
 export const REMINDER_HOURS_LIMITS: IInterval = { min: 0, max: 6 };

package/src/utils/RecommendationError.d.ts

@@ -9,7 +9,6 @@ export declare const ActivityDateError: () => RecommendationError;
 export declare const ActivityIntensityError: () => RecommendationError;
 export declare const ActivityTargetBGLError: () => RecommendationError;
 export declare const CarbohydrateLimitError: () => RecommendationError;
-export declare const InsulinLimitError: (activityReduction?: number) => RecommendationError;
 export declare const InsulinSensitivityError: () => RecommendationError;
 export declare const InsulinToCarbsRatioError: () => RecommendationError;
 export declare const CurrentBGLError: () => RecommendationError;

package/src/utils/RecommendationError.jsx

@@ -19,12 +19,11 @@ var __importStar = (this && this.__importStar) || function (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;
+exports.TimeoutLimitError = exports.UnitError = exports.LanguageError = exports.InjectionMethodError = exports.UserReminderError = exports.BolusInsulinSecondsPassedError = exports.BolusInsulinDosisError = exports.TargetBGLError = exports.CurrentBGLError = exports.InsulinToCarbsRatioError = exports.InsulinSensitivityError = 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");
-const AttentionMessages_1 = require("./AttentionMessages");
 class RecommendationError extends Error {
     constructor(message, type) {
         super(message);
@@ -38,7 +37,6 @@ 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.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);

package/src/utils/RecommendationError.tsx

@@ -2,7 +2,6 @@ import * as Calculator from "@hedia/recommendation-calculator";
 import { t } from "@lingui/macro";
 import { i18n } from "../locale/i18nUtils";
 import { RecommendationErrorEnum } from "../types/enum";
-import { Messages } from "./AttentionMessages";
 
 export class RecommendationError extends Error {
 	public readonly type: RecommendationErrorEnum;
@@ -51,12 +50,6 @@ export const CarbohydrateLimitError = (): RecommendationError =>
 		RecommendationErrorEnum.CarbohydrateLimit,
 	);
 
-export const InsulinLimitError = (activityReduction?: number): RecommendationError =>
-	new RecommendationError(
-		activityReduction ? Messages.InsulinWasLimited(activityReduction) : Messages.InsulinWasLimited(),
-		RecommendationErrorEnum.InsulinLimit,
-	);
-
 export const InsulinSensitivityError = (): RecommendationError =>
 	new RecommendationError(
 		i18n._(t`Error. Please verify that your insulin sensitivity value is correct.`),

package/src/utils/RecommendationUtils.d.ts

@@ -1,7 +1,6 @@
 import { IRecommendationParams } from "@hedia/recommendation-calculator";
-import { IRecommendationProps } from "../RecommendationScreen";
 import { BgLevel } from "../types/enum";
-import { IActivity, logbookEntry } from "../types/types";
+import { logbookEntry } from "../types/types";
 import { AttentionMessage, Messages } from "./AttentionMessages";
 export declare function getBGLevel(currentBGL: number, latestLogbookFrom6Hours: logbookEntry): BgLevel;
 export declare function getReminder(bgLevel: BgLevel, carbohydrates: number, userReminder: number, activity: IRecommendationParams["activity"]): number;
@@ -9,4 +8,4 @@ export declare function getAttentionMessage(bgLevel: BgLevel, activity: IRecomme
 export declare function isSevereHyperglycemia(latestLogbookFrom6Hours: logbookEntry): boolean;
 export declare function isActivityWithin15Minutes(activity: IRecommendationParams["activity"]): boolean;
 export declare function getLimitationMessage(wasLimited: boolean, activityReduction: number): Messages;
-export declare function getParams(props: IRecommendationProps): IRecommendationParams & IActivity;
+export declare function assignTargetBGL(calculatorParams: IRecommendationParams): IRecommendationParams;

package/src/utils/RecommendationUtils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getParams = exports.getLimitationMessage = exports.isActivityWithin15Minutes = exports.isSevereHyperglycemia = exports.getAttentionMessage = exports.getReminder = exports.getBGLevel = void 0;
+exports.assignTargetBGL = exports.getLimitationMessage = exports.isActivityWithin15Minutes = exports.isSevereHyperglycemia = exports.getAttentionMessage = exports.getReminder = exports.getBGLevel = void 0;
 const moment_1 = __importDefault(require("moment"));
 const enum_1 = require("../types/enum");
 const AttentionMessages_1 = require("./AttentionMessages");
@@ -106,8 +106,7 @@ function getLimitationMessage(wasLimited, activityReduction) {
     return wasLimited ? message : undefined;
 }
 exports.getLimitationMessage = getLimitationMessage;
-function getParams(props) {
-    const { calculatorParams } = props;
+function assignTargetBGL(calculatorParams) {
     const activityTarget = calculatorParams.activity?.activitySettings?.target;
     const paramsWithAssignedCurrentBGL = {
         ...calculatorParams,
@@ -115,4 +114,4 @@ function getParams(props) {
     };
     return calculatorParams.currentBGL === null ? paramsWithAssignedCurrentBGL : calculatorParams;
 }
-exports.getParams = getParams;
+exports.assignTargetBGL = assignTargetBGL;

package/src/utils/RecommendationUtils.ts

@@ -1,8 +1,7 @@
 import { IRecommendationParams } from "@hedia/recommendation-calculator";
 import moment from "moment";
-import { IRecommendationProps } from "../RecommendationScreen";
 import { BgLevel, RecommendationReminders } from "../types/enum";
-import { IActivity, logbookEntry } from "../types/types";
+import { logbookEntry } from "../types/types";
 import { addPostponeActivityMessage, AttentionMessage, Messages } from "./AttentionMessages";
 import { SEVERE_HYPERGLYCEMIA_START_MMOL } from "./Constants";
 import { CurrentBGLError } from "./RecommendationError";
@@ -117,8 +116,7 @@ export function getLimitationMessage(wasLimited: boolean, activityReduction: num
 	return wasLimited ? message : undefined;
 }
 
-export function getParams(props: IRecommendationProps): IRecommendationParams & IActivity {
-	const { calculatorParams } = props;
+export function assignTargetBGL(calculatorParams: IRecommendationParams): IRecommendationParams {
 	const activityTarget = calculatorParams.activity?.activitySettings?.target;
 	const paramsWithAssignedCurrentBGL = {
 		...calculatorParams,

package/src/utils/Utils.d.ts

@@ -4,4 +4,5 @@ export declare class Utils {
     static getRounding(method: InjectionMethod): number;
     static roundValue(value: number, injectMethod: InjectionMethod): number;
     static isInClosedInterval(value: number, interval: IInterval): boolean;
+    static convertToMGDL(bglValueMMOL: number): number;
 }

package/src/utils/Utils.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Utils = void 0;
 const enum_1 = require("../types/enum");
+const Constants_1 = require("./Constants");
 class Utils {
     static getRounding(method) {
         switch (method) {
@@ -26,5 +27,8 @@ class Utils {
         }
         return value >= interval.min && value <= interval.max;
     }
+    static convertToMGDL(bglValueMMOL) {
+        return Math.round(bglValueMMOL * Constants_1.MGDL_PER_MMOLL);
+    }
 }
 exports.Utils = Utils;

package/src/utils/Utils.ts

@@ -1,5 +1,6 @@
 import { InjectionMethod } from "../types/enum";
 import { IInterval } from "../types/types";
+import { MGDL_PER_MMOLL } from "./Constants";
 
 export class Utils {
 	public static getRounding(method: InjectionMethod): number {
@@ -31,4 +32,7 @@ export class Utils {
 
 		return value >= interval.min && value <= interval.max;
 	}
+	public static convertToMGDL(bglValueMMOL: number): number {
+		return Math.round(bglValueMMOL * MGDL_PER_MMOLL);
+	}
 }