@hedia/recommendation-screen 1.3.2 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hedia/recommendation-screen",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "description": "Hedia Recommendation Screen for Bolus and Carbohydrates",
   "main": "index.js",
   "scripts": {

package/src/RecommendationScreen.jsx

@@ -53,7 +53,7 @@ class RecommendationScreen extends react_1.default.Component {
         super(props);
         this.hasError = false;
         this.recalculateInsulin = (calculatorParams) => {
-            const { bolus } = Calculator.calculateRecommendation(RecommendationUtils_1.assignTargetBGL(calculatorParams));
+            const { bolus } = Calculator.calculateRecommendation(calculatorParams);
             this.setState({
                 insulinRecommendation: Utils_1.Utils.roundValue(bolus, this.props.injectionMethod),
                 enteredInsulin: undefined,
@@ -137,7 +137,7 @@ class RecommendationScreen extends react_1.default.Component {
             Validations_1.validateParams(props);
             i18nUtils_1.changeLanguage(props.language);
             const { recentBoluses } = props.calculatorParams;
-            const { bolus, carbRecommendation, activityReduction, wasLimited, activeInsulin, } = Calculator.calculateRecommendation(RecommendationUtils_1.assignTargetBGL(props.calculatorParams));
+            const { bolus, carbRecommendation, activityReduction, wasLimited, activeInsulin, } = Calculator.calculateRecommendation(props.calculatorParams);
             this.suggestedCarbs = carbRecommendation;
             this.state = {
                 remeasureTime: this.getBGLevelRemeasurementReminder(),

package/src/RecommendationScreen.tsx

@@ -24,13 +24,7 @@ import RecommendationModal from "./components/RecommendationModal";
 import { changeLanguage, i18n } from "./locale/i18nUtils";
 import { IActivityDisplayProps, logbookEntry } from "./types/types";
 import { AttentionMessage } from "./utils/AttentionMessages";
-import {
-	assignTargetBGL,
-	getAttentionMessage,
-	getBGLevel,
-	getLimitationMessage,
-	getReminder,
-} from "./utils/RecommendationUtils";
+import { getAttentionMessage, getBGLevel, getLimitationMessage, getReminder } from "./utils/RecommendationUtils";
 import { Utils } from "./utils/Utils";
 import { validateParams } from "./utils/Validations";
 
@@ -98,7 +92,7 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
 				activityReduction,
 				wasLimited,
 				activeInsulin,
-			} = Calculator.calculateRecommendation(assignTargetBGL(props.calculatorParams));
+			} = Calculator.calculateRecommendation(props.calculatorParams);
 
 			this.suggestedCarbs = carbRecommendation;
 
@@ -130,7 +124,7 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
 	}
 
 	public recalculateInsulin = (calculatorParams: Calculator.IRecommendationParams): void => {
-		const { bolus } = Calculator.calculateRecommendation(assignTargetBGL(calculatorParams));
+		const { bolus } = Calculator.calculateRecommendation(calculatorParams);
 		this.setState({
 			insulinRecommendation: Utils.roundValue(bolus, this.props.injectionMethod),
 			enteredInsulin: undefined,

package/src/utils/RecommendationUtils.d.ts

@@ -1,4 +1,3 @@
-import { IRecommendationParams } from "@hedia/recommendation-calculator";
 import { IActivityParams } from "@hedia/recommendation-calculator/src/RecommendationCalculator";
 import { BgLevel } from "../types/enum";
 import { logbookEntry } from "../types/types";
@@ -9,4 +8,3 @@ export declare function getAttentionMessage(bgLevel: BgLevel, activity: IActivit
 export declare function isSevereHyperglycemia(latestLogbookFrom6Hours: logbookEntry): boolean;
 export declare function isActivityWithin15Minutes(activity: IActivityParams): boolean;
 export declare function getLimitationMessage(wasLimited: boolean, activityReduction: number): Messages;
-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.assignTargetBGL = exports.getLimitationMessage = exports.isActivityWithin15Minutes = exports.isSevereHyperglycemia = exports.getAttentionMessage = exports.getReminder = exports.getBGLevel = void 0;
+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");
@@ -105,7 +105,3 @@ function getLimitationMessage(wasLimited, activityReduction) {
     return wasLimited ? message : undefined;
 }
 exports.getLimitationMessage = getLimitationMessage;
-function assignTargetBGL(calculatorParams) {
-    return { ...calculatorParams, currentBGL: calculatorParams.currentBGL ?? calculatorParams.targetBGL };
-}
-exports.assignTargetBGL = assignTargetBGL;

package/src/utils/RecommendationUtils.ts

@@ -1,4 +1,3 @@
-import { IRecommendationParams } from "@hedia/recommendation-calculator";
 import { IActivityParams } from "@hedia/recommendation-calculator/src/RecommendationCalculator";
 import moment from "moment";
 import { BgLevel, RecommendationReminders } from "../types/enum";
@@ -114,7 +113,3 @@ export function getLimitationMessage(wasLimited: boolean, activityReduction: num
 		: Messages.RecommendationWasLimited();
 	return wasLimited ? message : undefined;
 }
-
-export function assignTargetBGL(calculatorParams: IRecommendationParams): IRecommendationParams {
-	return { ...calculatorParams, currentBGL: calculatorParams.currentBGL ?? calculatorParams.targetBGL };
-}

package/src/utils/Validations.js

@@ -16,7 +16,9 @@ function validateParams(props) {
     checkInjectionMethod(props.injectionMethod);
     checkUserReminder(props.userReminder);
     checkLanguage(props.language);
-    checkActivityType(props.activityDisplayProps.activityType);
+    if (props.calculatorParams.activity) {
+        checkActivityType(props.activityDisplayProps.activityType);
+    }
 }
 exports.validateParams = validateParams;
 function checkLanguage(language) {

package/src/utils/Validations.ts

@@ -51,7 +51,9 @@ export function validateParams(props: IRecommendationProps): void {
 	checkInjectionMethod(props.injectionMethod);
 	checkUserReminder(props.userReminder);
 	checkLanguage(props.language);
-	checkActivityType(props.activityDisplayProps.activityType);
+	if (props.calculatorParams.activity) {
+		checkActivityType(props.activityDisplayProps.activityType);
+	}
 }
 
 export function checkLanguage(language: Language): void {