@hedia/recommendation-screen 2.0.1 → 2.0.2

package/src/locale/it/messages.po

@@ -60,18 +60,22 @@ msgstr "Ricorda di non iniziare l'attività fisica prima che il livello di gluco
 msgid "Entered"
 msgstr "Inserito"
 
-#: src/utils/RecommendationError.tsx:26
+#: src/utils/RecommendationError.tsx:27
 msgid "Error. Hedia Calculator could not find your recent boluses"
 msgstr ""
 
-#: src/utils/RecommendationError.tsx:24
+#: src/utils/RecommendationError.tsx:25
 msgid "Error. Hedia Calculator does not support an insulin dose greater than {SAFETY_INSULIN_LIMIT} units"
 msgstr "Errore. Hedia Calculator non supporta una dose di insulina superiore a {SAFETY_INSULIN_LIMIT} unità"
 
-#: src/utils/RecommendationError.tsx:25
+#: src/utils/RecommendationError.tsx:26
 msgid "Error. Hedia Calculator does not support insulin recommendations with boluses older than 4 hours"
 msgstr "Errore. Hedia Calculator non supporta le raccomandazioni di insulina con boli più vecchi di 4 ore"
 
+#: src/utils/RecommendationError.tsx:22
+msgid "Error. Hedia Calculator does not support the blood glucose level of your latest logbook entry from the last 6 hours."
+msgstr ""
+
 #: src/utils/RecommendationError.tsx:15
 msgid "Error. Hedia Calculator does not support your activity intensity value"
 msgstr "Errore. Hedia Calculator non supporta il valore dell'intensità dell'attività"
@@ -84,23 +88,23 @@ msgstr "Errore. Hedia Calculator non supporta il valore del tipo di attività"
 msgid "Error. Hedia Calculator does not support your current blood glucose level."
 msgstr "Errore. Hedia Calculator non supporta il livello attuale di glucosio nel sangue."
 
-#: src/utils/RecommendationError.tsx:31
+#: src/utils/RecommendationError.tsx:32
 msgid "Error. Hedia Calculator does not support your current blood glucose unit."
 msgstr "Errore. Hedia Calculator non supporta l'attuale unità misura di glucosio nel sangue."
 
-#: src/utils/RecommendationError.tsx:22
+#: src/utils/RecommendationError.tsx:23
 msgid "Error. Hedia Calculator does not support your current blood ketone level."
 msgstr "Errore. Hedia Calculator non supporta l'attuale livello di chetoni nel sangue."
 
-#: src/utils/RecommendationError.tsx:30
+#: src/utils/RecommendationError.tsx:31
 msgid "Error. Hedia Calculator does not support your current blood ketone unit."
 msgstr "Errore. Hedia Calculator non supporta l'attuale unità di misura di chetoni del sangue."
 
-#: src/utils/RecommendationError.tsx:29
+#: src/utils/RecommendationError.tsx:30
 msgid "Error. Hedia Calculator does not support your current language."
 msgstr "Errore. Hedia Calculator non supporta la lingua corrente."
 
-#: src/utils/RecommendationError.tsx:28
+#: src/utils/RecommendationError.tsx:29
 msgid "Error. Hedia Calculator does not support your injection method."
 msgstr "Errore. Hedia Calculator non supporta il metodo di iniezione."
 
@@ -124,11 +128,11 @@ msgstr "Errore. Verificare che il valore della sensibilità all'insulina sia cor
 msgid "Error. Please verify that your insulin to carb ratio value is correct."
 msgstr "Errore. Verificare che il valore del rapporto insulina/carboidrati sia corretto."
 
-#: src/utils/RecommendationError.tsx:23
+#: src/utils/RecommendationError.tsx:24
 msgid "Error. Please verify that your target blood glucose value is correct."
 msgstr "Errore. Verificare che il valore obiettivo della glicemia sia corretto."
 
-#: src/utils/RecommendationError.tsx:27
+#: src/utils/RecommendationError.tsx:28
 msgid "Error. Please verify your notifications settings."
 msgstr "Errore. Verificare le impostazioni di notifica."
 

package/src/types/enum.d.ts

@@ -55,14 +55,15 @@ export declare enum RecommendationErrorEnum {
     CarbohydrateLimit = 9,
     InsulinSensitivity = 10,
     InsulinToCarbsRatio = 11,
-    CurrentBGL = 12,
-    CurrentBKL = 13,
-    TargetBGL = 14,
-    UserReminder = 15,
-    Language = 16,
-    InjectionMethod = 17,
-    BloodKetoneUnit = 18,
-    BloodGlucoseUnit = 19
+    LatestLogbook6HoursBGL = 12,
+    CurrentBGL = 13,
+    CurrentBKL = 14,
+    TargetBGL = 15,
+    UserReminder = 16,
+    Language = 17,
+    InjectionMethod = 18,
+    BloodKetoneUnit = 19,
+    BloodGlucoseUnit = 20
 }
 export declare enum BgLevel {
     SevereHypoglycemia = 0,

package/src/types/enum.js

@@ -68,14 +68,15 @@ var RecommendationErrorEnum;
     RecommendationErrorEnum[RecommendationErrorEnum["CarbohydrateLimit"] = 9] = "CarbohydrateLimit";
     RecommendationErrorEnum[RecommendationErrorEnum["InsulinSensitivity"] = 10] = "InsulinSensitivity";
     RecommendationErrorEnum[RecommendationErrorEnum["InsulinToCarbsRatio"] = 11] = "InsulinToCarbsRatio";
-    RecommendationErrorEnum[RecommendationErrorEnum["CurrentBGL"] = 12] = "CurrentBGL";
-    RecommendationErrorEnum[RecommendationErrorEnum["CurrentBKL"] = 13] = "CurrentBKL";
-    RecommendationErrorEnum[RecommendationErrorEnum["TargetBGL"] = 14] = "TargetBGL";
-    RecommendationErrorEnum[RecommendationErrorEnum["UserReminder"] = 15] = "UserReminder";
-    RecommendationErrorEnum[RecommendationErrorEnum["Language"] = 16] = "Language";
-    RecommendationErrorEnum[RecommendationErrorEnum["InjectionMethod"] = 17] = "InjectionMethod";
-    RecommendationErrorEnum[RecommendationErrorEnum["BloodKetoneUnit"] = 18] = "BloodKetoneUnit";
-    RecommendationErrorEnum[RecommendationErrorEnum["BloodGlucoseUnit"] = 19] = "BloodGlucoseUnit";
+    RecommendationErrorEnum[RecommendationErrorEnum["LatestLogbook6HoursBGL"] = 12] = "LatestLogbook6HoursBGL";
+    RecommendationErrorEnum[RecommendationErrorEnum["CurrentBGL"] = 13] = "CurrentBGL";
+    RecommendationErrorEnum[RecommendationErrorEnum["CurrentBKL"] = 14] = "CurrentBKL";
+    RecommendationErrorEnum[RecommendationErrorEnum["TargetBGL"] = 15] = "TargetBGL";
+    RecommendationErrorEnum[RecommendationErrorEnum["UserReminder"] = 16] = "UserReminder";
+    RecommendationErrorEnum[RecommendationErrorEnum["Language"] = 17] = "Language";
+    RecommendationErrorEnum[RecommendationErrorEnum["InjectionMethod"] = 18] = "InjectionMethod";
+    RecommendationErrorEnum[RecommendationErrorEnum["BloodKetoneUnit"] = 19] = "BloodKetoneUnit";
+    RecommendationErrorEnum[RecommendationErrorEnum["BloodGlucoseUnit"] = 20] = "BloodGlucoseUnit";
 })(RecommendationErrorEnum = exports.RecommendationErrorEnum || (exports.RecommendationErrorEnum = {}));
 var BgLevel;
 (function (BgLevel) {

package/src/types/enum.ts

@@ -76,6 +76,7 @@ export enum RecommendationErrorEnum {
 	CarbohydrateLimit,
 	InsulinSensitivity,
 	InsulinToCarbsRatio,
+	LatestLogbook6HoursBGL,
 	CurrentBGL,
 	CurrentBKL,
 	TargetBGL,

package/src/utils/RecommendationError.d.ts

@@ -13,6 +13,7 @@ export declare const CarbohydrateLimitError: () => RecommendationError;
 export declare const InsulinSensitivityError: () => RecommendationError;
 export declare const InsulinToCarbsRatioError: () => RecommendationError;
 export declare const CurrentBGLError: () => RecommendationError;
+export declare const LatestLogbook6HoursBGLError: () => RecommendationError;
 export declare const CurrentBKLError: () => RecommendationError;
 export declare const TargetBGLError: () => RecommendationError;
 export declare const BolusInsulinDoseError: () => RecommendationError;

package/src/utils/RecommendationError.jsx

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BloodGlucoseUnitError = exports.BloodKetoneUnitError = exports.LanguageError = exports.InjectionMethodError = exports.UserReminderError = exports.RecentBolusError = exports.BolusInsulinSecondsPassedError = exports.BolusInsulinDoseError = exports.TargetBGLError = exports.CurrentBKLError = exports.CurrentBGLError = exports.InsulinToCarbsRatioError = exports.InsulinSensitivityError = exports.CarbohydrateLimitError = exports.ActivityTargetBGLError = exports.ActivityTypeError = exports.ActivityIntensityError = exports.ActivityDateError = exports.ActivityDurationError = exports.ActivitySettingsError = exports.RecommendationError = void 0;
+exports.BloodGlucoseUnitError = exports.BloodKetoneUnitError = exports.LanguageError = exports.InjectionMethodError = exports.UserReminderError = exports.RecentBolusError = exports.BolusInsulinSecondsPassedError = exports.BolusInsulinDoseError = exports.TargetBGLError = exports.CurrentBKLError = exports.LatestLogbook6HoursBGLError = exports.CurrentBGLError = exports.InsulinToCarbsRatioError = exports.InsulinSensitivityError = exports.CarbohydrateLimitError = exports.ActivityTargetBGLError = exports.ActivityTypeError = exports.ActivityIntensityError = exports.ActivityDateError = exports.ActivityDurationError = exports.ActivitySettingsError = exports.RecommendationError = void 0;
 const types_1 = require("@hedia/types");
 const macro_1 = require("@lingui/macro");
 const i18nUtils_1 = require("../locale/i18nUtils");
@@ -33,6 +33,8 @@ const InsulinToCarbsRatioError = () => new RecommendationError(i18nUtils_1.i18n.
 exports.InsulinToCarbsRatioError = InsulinToCarbsRatioError;
 const 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.CurrentBGLError = CurrentBGLError;
+const LatestLogbook6HoursBGLError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support the blood glucose level of your latest logbook entry from the last 6 hours.`), enum_1.RecommendationErrorEnum.LatestLogbook6HoursBGL);
+exports.LatestLogbook6HoursBGLError = LatestLogbook6HoursBGLError;
 const CurrentBKLError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support your current blood ketone level.`), enum_1.RecommendationErrorEnum.CurrentBKL);
 exports.CurrentBKLError = CurrentBKLError;
 const TargetBGLError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Please verify that your target blood glucose value is correct.`), enum_1.RecommendationErrorEnum.TargetBGL);

package/src/utils/RecommendationError.tsx

@@ -74,6 +74,13 @@ export const CurrentBGLError = (): RecommendationError =>
 		i18n._(t`Error. Hedia Calculator does not support your current blood glucose level.`),
 		RecommendationErrorEnum.CurrentBGL,
 	);
+export const LatestLogbook6HoursBGLError = (): RecommendationError =>
+	new RecommendationError(
+		i18n._(
+			t`Error. Hedia Calculator does not support the blood glucose level of your latest logbook entry from the last 6 hours.`,
+		),
+		RecommendationErrorEnum.LatestLogbook6HoursBGL,
+	);
 export const CurrentBKLError = (): RecommendationError =>
 	new RecommendationError(
 		i18n._(t`Error. Hedia Calculator does not support your current blood ketone level.`),

package/src/utils/Utils.d.ts

@@ -3,7 +3,7 @@ import { IInterval } from "../types/types";
 export declare class Utils {
     static getRounding(method: UserSettings.Enums.InjectionMethod): number;
     static roundValue(value: number, injectMethod: UserSettings.Enums.InjectionMethod): number;
-    static isInClosedInterval(value: number | null, interval: IInterval): boolean;
+    static isInRange(value: number | null, interval: IInterval): boolean;
     static convertBGLToMGDL(value: number): number;
     static displayedBGLValue(value: number, unit: BloodGlucoseUnit): number;
     static convertBKLToMGDL(value: number): number;

package/src/utils/Utils.js

@@ -22,7 +22,7 @@ class Utils {
         const rounding = Utils.getRounding(injectMethod);
         return Math.round(value * rounding) / rounding;
     }
-    static isInClosedInterval(value, interval) {
+    static isInRange(value, interval) {
         if (value === null) {
             return false;
         }

package/src/utils/Utils.ts

@@ -27,7 +27,7 @@ export class Utils {
 		return Math.round(value * rounding) / rounding;
 	}
 
-	public static isInClosedInterval(value: number | null, interval: IInterval): boolean {
+	public static isInRange(value: number | null, interval: IInterval): boolean {
 		if (value === null) {
 			return false;
 		}

package/src/utils/Validations.d.ts

@@ -1,8 +1,9 @@
 import { Activity, BloodGlucoseUnit, BloodKetonesUnit, Languages, UserSettings } from "@hedia/types";
 import { IRecommendationProps } from "../RecommendationScreen";
-import { ActivitySettings, IActivityParams, IRecentBolus } from "../types/types";
+import { ActivitySettings, IActivityParams, IRecentBolus, logbookEntry } from "../types/types";
 export declare function validateParams(props: IRecommendationProps): void;
 export declare function checkLanguage(language: Languages): void;
+export declare function checkLatestLogbook6Hours(logbook: logbookEntry | null): void;
 export declare function checkInjectionMethod(injectionMethod: UserSettings.Enums.InjectionMethod): void;
 export declare function checkBGLUnit(unit: BloodGlucoseUnit): void;
 export declare function checkBKLUnit(unit: BloodKetonesUnit): void;

package/src/utils/Validations.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.checkCarbohydrates = exports.checkInsulinToCarbRatio = exports.checkInsulinSensitivity = exports.checkBloodKetoneLevel = exports.checkTargetBGL = exports.checkCurrentBGL = exports.checkActivityTargetBGL = exports.checkActivitySettings = exports.checkActivityDate = exports.checkActivityType = exports.checkActivityIntensity = exports.checkActivityDuration = exports.checkRecentBolusesSecondsPassed = exports.checkRecentBolusesInsulinDose = exports.checkRecentBolus = exports.checkActivity = exports.checkUserReminder = exports.checkBKLUnit = exports.checkBGLUnit = exports.checkInjectionMethod = exports.checkLanguage = exports.validateParams = void 0;
+exports.checkCarbohydrates = exports.checkInsulinToCarbRatio = exports.checkInsulinSensitivity = exports.checkBloodKetoneLevel = exports.checkTargetBGL = exports.checkCurrentBGL = exports.checkActivityTargetBGL = exports.checkActivitySettings = exports.checkActivityDate = exports.checkActivityType = exports.checkActivityIntensity = exports.checkActivityDuration = exports.checkRecentBolusesSecondsPassed = exports.checkRecentBolusesInsulinDose = exports.checkRecentBolus = exports.checkActivity = exports.checkUserReminder = exports.checkBKLUnit = exports.checkBGLUnit = exports.checkInjectionMethod = exports.checkLatestLogbook6Hours = exports.checkLanguage = exports.validateParams = void 0;
 const types_1 = require("@hedia/types");
 const moment_1 = __importDefault(require("moment"));
 const Constants_1 = require("./Constants");
@@ -19,6 +19,7 @@ function validateParams(props) {
     checkInjectionMethod(props.injectionMethod);
     checkUserReminder(props.userReminder);
     checkLanguage(props.language);
+    checkLatestLogbook6Hours(props.latestLogbookFrom6Hours);
     if (props?.calculatorParams?.activity && props?.activityDisplayProps) {
         checkActivityType(props.activityDisplayProps.activityType);
     }
@@ -30,6 +31,17 @@ function checkLanguage(language) {
     }
 }
 exports.checkLanguage = checkLanguage;
+function checkLatestLogbook6Hours(logbook) {
+    if (logbook === undefined) {
+        throw RecommendationError_1.LatestLogbook6HoursBGLError();
+    }
+    if (logbook !== null) {
+        if (!Utils_1.Utils.isInRange(logbook.blood_glucose_millimolar, Constants_1.CURRENT_BGL_MMOL_LIMITS)) {
+            throw RecommendationError_1.LatestLogbook6HoursBGLError();
+        }
+    }
+}
+exports.checkLatestLogbook6Hours = checkLatestLogbook6Hours;
 function checkInjectionMethod(injectionMethod) {
     const check = Object.values(types_1.UserSettings.Enums.InjectionMethod).some((method) => method === injectionMethod);
     if (!check) {
@@ -52,7 +64,7 @@ function checkBKLUnit(unit) {
 }
 exports.checkBKLUnit = checkBKLUnit;
 function checkUserReminder(userReminder) {
-    if (!Utils_1.Utils.isInClosedInterval(userReminder, Constants_1.REMINDER_HOURS_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(userReminder, Constants_1.REMINDER_HOURS_LIMITS)) {
         throw RecommendationError_1.UserReminderError();
     }
 }
@@ -86,7 +98,7 @@ function checkRecentBolus(recentBoluses) {
 exports.checkRecentBolus = checkRecentBolus;
 function checkRecentBolusesInsulinDose(recentBoluses) {
     recentBoluses.forEach((bolus) => {
-        if (!Utils_1.Utils.isInClosedInterval(bolus.insulinDose, Constants_1.INSULIN_DOSE_LIMITS)) {
+        if (!Utils_1.Utils.isInRange(bolus.insulinDose, Constants_1.INSULIN_DOSE_LIMITS)) {
             throw RecommendationError_1.BolusInsulinDoseError();
         }
     });
@@ -94,14 +106,14 @@ function checkRecentBolusesInsulinDose(recentBoluses) {
 exports.checkRecentBolusesInsulinDose = checkRecentBolusesInsulinDose;
 function checkRecentBolusesSecondsPassed(recentBoluses) {
     recentBoluses.forEach((bolus) => {
-        if (!Utils_1.Utils.isInClosedInterval(bolus.secondsPassed, Constants_1.BOLUS_SECONDS_PASSED_LIMITS)) {
+        if (!Utils_1.Utils.isInRange(bolus.secondsPassed, Constants_1.BOLUS_SECONDS_PASSED_LIMITS)) {
             throw RecommendationError_1.BolusInsulinSecondsPassedError();
         }
     });
 }
 exports.checkRecentBolusesSecondsPassed = checkRecentBolusesSecondsPassed;
 function checkActivityDuration(activityDuration) {
-    if (!Utils_1.Utils.isInClosedInterval(activityDuration, Constants_1.ACTIVITY_DURATION_MINUTES_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(activityDuration, Constants_1.ACTIVITY_DURATION_MINUTES_LIMITS)) {
         throw RecommendationError_1.ActivityDurationError();
     }
 }
@@ -134,7 +146,7 @@ function checkActivitySettings(activitySettings) {
         const reductionIntervals = activitySettings[intensity];
         for (const interval of Object.keys(reductionIntervals)) {
             const value = activitySettings[intensity][interval];
-            const isInInterval = Utils_1.Utils.isInClosedInterval(value, Constants_1.ACTIVITY_SETTINGS_INTERVAL_LIMITS);
+            const isInInterval = Utils_1.Utils.isInRange(value, Constants_1.ACTIVITY_SETTINGS_INTERVAL_LIMITS);
             if (intensity === hard && interval === fromFortysix) {
                 if (!isInInterval && value !== null) {
                     throw RecommendationError_1.ActivitySettingsError();
@@ -148,47 +160,47 @@ function checkActivitySettings(activitySettings) {
 }
 exports.checkActivitySettings = checkActivitySettings;
 function checkActivityTargetBGL(activitySettingsTargetBGL) {
-    if (!Utils_1.Utils.isInClosedInterval(activitySettingsTargetBGL, Constants_1.ACTIVITY_TARGET_BGL_MMOL_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(activitySettingsTargetBGL, Constants_1.ACTIVITY_TARGET_BGL_MMOL_LIMITS)) {
         throw RecommendationError_1.ActivityTargetBGLError();
     }
 }
 exports.checkActivityTargetBGL = checkActivityTargetBGL;
 function checkCurrentBGL(currentBGL) {
     if (currentBGL !== null) {
-        if (!Utils_1.Utils.isInClosedInterval(currentBGL, Constants_1.CURRENT_BGL_MMOL_LIMITS)) {
+        if (!Utils_1.Utils.isInRange(currentBGL, Constants_1.CURRENT_BGL_MMOL_LIMITS)) {
             throw RecommendationError_1.CurrentBGLError();
         }
     }
 }
 exports.checkCurrentBGL = checkCurrentBGL;
 function checkTargetBGL(targetBGL) {
-    if (!Utils_1.Utils.isInClosedInterval(targetBGL, Constants_1.TARGET_BGL_MMOL_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(targetBGL, Constants_1.TARGET_BGL_MMOL_LIMITS)) {
         throw RecommendationError_1.TargetBGLError();
     }
 }
 exports.checkTargetBGL = checkTargetBGL;
 function checkBloodKetoneLevel(currentBKL) {
     if (currentBKL !== null) {
-        if (!Utils_1.Utils.isInClosedInterval(currentBKL, Constants_1.CURRENT_BKL_MMOL_LIMITS)) {
+        if (!Utils_1.Utils.isInRange(currentBKL, Constants_1.CURRENT_BKL_MMOL_LIMITS)) {
             throw RecommendationError_1.CurrentBKLError();
         }
     }
 }
 exports.checkBloodKetoneLevel = checkBloodKetoneLevel;
 function checkInsulinSensitivity(insulinSensitivity) {
-    if (!Utils_1.Utils.isInClosedInterval(insulinSensitivity, Constants_1.INSULIN_SENSITIVITY_MMOL_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(insulinSensitivity, Constants_1.INSULIN_SENSITIVITY_MMOL_LIMITS)) {
         throw RecommendationError_1.InsulinSensitivityError();
     }
 }
 exports.checkInsulinSensitivity = checkInsulinSensitivity;
 function checkInsulinToCarbRatio(insulinToCarbRatio) {
-    if (!Utils_1.Utils.isInClosedInterval(insulinToCarbRatio, Constants_1.INSULIN_TO_CARBS_RATIO_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(insulinToCarbRatio, Constants_1.INSULIN_TO_CARBS_RATIO_LIMITS)) {
         throw RecommendationError_1.InsulinToCarbsRatioError();
     }
 }
 exports.checkInsulinToCarbRatio = checkInsulinToCarbRatio;
 function checkCarbohydrates(carbohydrates) {
-    if (!Utils_1.Utils.isInClosedInterval(carbohydrates, Constants_1.CARBOHYDRATES_LIMTS)) {
+    if (!Utils_1.Utils.isInRange(carbohydrates, Constants_1.CARBOHYDRATES_LIMTS)) {
         throw RecommendationError_1.CarbohydrateLimitError();
     }
 }

package/src/utils/Validations.ts

@@ -1,7 +1,7 @@
 import { Activity, BloodGlucoseUnit, BloodKetonesUnit, Languages, UserSettings } from "@hedia/types";
 import moment from "moment";
 import { IRecommendationProps } from "../RecommendationScreen";
-import { ActivitySettings, IActivityParams, IRecentBolus, IRecommendationParams } from "../types/types";
+import { ActivitySettings, IActivityParams, IRecentBolus, IRecommendationParams, logbookEntry } from "../types/types";
 import {
 	ACTIVITY_BUFFER_MINUTES,
 	ACTIVITY_DURATION_MINUTES_LIMITS,
@@ -36,6 +36,7 @@ import {
 	InsulinSensitivityError,
 	InsulinToCarbsRatioError,
 	LanguageError,
+	LatestLogbook6HoursBGLError,
 	RecentBolusError,
 	TargetBGLError,
 	UserReminderError,
@@ -55,6 +56,7 @@ export function validateParams(props: IRecommendationProps): void {
 	checkInjectionMethod(props.injectionMethod);
 	checkUserReminder(props.userReminder);
 	checkLanguage(props.language);
+	checkLatestLogbook6Hours(props.latestLogbookFrom6Hours);
 	if (props?.calculatorParams?.activity && props?.activityDisplayProps) {
 		checkActivityType(props.activityDisplayProps.activityType);
 	}
@@ -65,6 +67,16 @@ export function checkLanguage(language: Languages): void {
 		throw LanguageError();
 	}
 }
+export function checkLatestLogbook6Hours(logbook: logbookEntry | null): void {
+	if (logbook === undefined) {
+		throw LatestLogbook6HoursBGLError();
+	}
+	if (logbook !== null) {
+		if (!Utils.isInRange(logbook.blood_glucose_millimolar, CURRENT_BGL_MMOL_LIMITS)) {
+			throw LatestLogbook6HoursBGLError();
+		}
+	}
+}
 
 export function checkInjectionMethod(injectionMethod: UserSettings.Enums.InjectionMethod): void {
 	const check = Object.values(UserSettings.Enums.InjectionMethod).some(
@@ -89,7 +101,7 @@ export function checkBKLUnit(unit: BloodKetonesUnit): void {
 }
 
 export function checkUserReminder(userReminder: number): void {
-	if (!Utils.isInClosedInterval(userReminder, REMINDER_HOURS_LIMITS)) {
+	if (!Utils.isInRange(userReminder, REMINDER_HOURS_LIMITS)) {
 		throw UserReminderError();
 	}
 }
@@ -124,7 +136,7 @@ export function checkRecentBolus(recentBoluses: Array<IRecentBolus>): void {
 
 export function checkRecentBolusesInsulinDose(recentBoluses: Array<IRecentBolus>): void {
 	recentBoluses.forEach((bolus: IRecentBolus): void => {
-		if (!Utils.isInClosedInterval(bolus.insulinDose, INSULIN_DOSE_LIMITS)) {
+		if (!Utils.isInRange(bolus.insulinDose, INSULIN_DOSE_LIMITS)) {
 			throw BolusInsulinDoseError();
 		}
 	});
@@ -132,14 +144,14 @@ export function checkRecentBolusesInsulinDose(recentBoluses: Array<IRecentBolus>
 
 export function checkRecentBolusesSecondsPassed(recentBoluses: Array<IRecentBolus>): void {
 	recentBoluses.forEach((bolus: IRecentBolus): void => {
-		if (!Utils.isInClosedInterval(bolus.secondsPassed, BOLUS_SECONDS_PASSED_LIMITS)) {
+		if (!Utils.isInRange(bolus.secondsPassed, BOLUS_SECONDS_PASSED_LIMITS)) {
 			throw BolusInsulinSecondsPassedError();
 		}
 	});
 }
 
 export function checkActivityDuration(activityDuration: number): void {
-	if (!Utils.isInClosedInterval(activityDuration, ACTIVITY_DURATION_MINUTES_LIMITS)) {
+	if (!Utils.isInRange(activityDuration, ACTIVITY_DURATION_MINUTES_LIMITS)) {
 		throw ActivityDurationError();
 	}
 }
@@ -174,7 +186,7 @@ export function checkActivitySettings(activitySettings: ActivitySettings): void
 		const reductionIntervals = activitySettings[intensity];
 		for (const interval of Object.keys(reductionIntervals) as Array<keyof typeof reductionIntervals>) {
 			const value = activitySettings[intensity][interval];
-			const isInInterval: boolean = Utils.isInClosedInterval(value, ACTIVITY_SETTINGS_INTERVAL_LIMITS);
+			const isInInterval: boolean = Utils.isInRange(value, ACTIVITY_SETTINGS_INTERVAL_LIMITS);
 			if (intensity === hard && interval === fromFortysix) {
 				if (!isInInterval && value !== null) {
 					throw ActivitySettingsError();
@@ -187,47 +199,47 @@ export function checkActivitySettings(activitySettings: ActivitySettings): void
 }
 
 export function checkActivityTargetBGL(activitySettingsTargetBGL: number): void {
-	if (!Utils.isInClosedInterval(activitySettingsTargetBGL, ACTIVITY_TARGET_BGL_MMOL_LIMITS)) {
+	if (!Utils.isInRange(activitySettingsTargetBGL, ACTIVITY_TARGET_BGL_MMOL_LIMITS)) {
 		throw ActivityTargetBGLError();
 	}
 }
 
 export function checkCurrentBGL(currentBGL: number): void {
 	if (currentBGL !== null) {
-		if (!Utils.isInClosedInterval(currentBGL, CURRENT_BGL_MMOL_LIMITS)) {
+		if (!Utils.isInRange(currentBGL, CURRENT_BGL_MMOL_LIMITS)) {
 			throw CurrentBGLError();
 		}
 	}
 }
 
 export function checkTargetBGL(targetBGL: number): void {
-	if (!Utils.isInClosedInterval(targetBGL, TARGET_BGL_MMOL_LIMITS)) {
+	if (!Utils.isInRange(targetBGL, TARGET_BGL_MMOL_LIMITS)) {
 		throw TargetBGLError();
 	}
 }
 
 export function checkBloodKetoneLevel(currentBKL: number): void {
 	if (currentBKL !== null) {
-		if (!Utils.isInClosedInterval(currentBKL, CURRENT_BKL_MMOL_LIMITS)) {
+		if (!Utils.isInRange(currentBKL, CURRENT_BKL_MMOL_LIMITS)) {
 			throw CurrentBKLError();
 		}
 	}
 }
 
 export function checkInsulinSensitivity(insulinSensitivity: number): void {
-	if (!Utils.isInClosedInterval(insulinSensitivity, INSULIN_SENSITIVITY_MMOL_LIMITS)) {
+	if (!Utils.isInRange(insulinSensitivity, INSULIN_SENSITIVITY_MMOL_LIMITS)) {
 		throw InsulinSensitivityError();
 	}
 }
 
 export function checkInsulinToCarbRatio(insulinToCarbRatio: number): void {
-	if (!Utils.isInClosedInterval(insulinToCarbRatio, INSULIN_TO_CARBS_RATIO_LIMITS)) {
+	if (!Utils.isInRange(insulinToCarbRatio, INSULIN_TO_CARBS_RATIO_LIMITS)) {
 		throw InsulinToCarbsRatioError();
 	}
 }
 
 export function checkCarbohydrates(carbohydrates: number): void {
-	if (!Utils.isInClosedInterval(carbohydrates, CARBOHYDRATES_LIMTS)) {
+	if (!Utils.isInRange(carbohydrates, CARBOHYDRATES_LIMTS)) {
 		throw CarbohydrateLimitError();
 	}
 }