@hedia/recommendation-screen 1.8.2 → 2.0.2

package/src/types/enum.js

@@ -1,43 +1,59 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RecommendationReminders = exports.BgLevel = exports.Milliseconds = exports.RecommendationErrorEnum = exports.ActivityInterval = exports.Language = exports.InjectionMethod = exports.ActivityEnum = exports.MoodEnum = void 0;
-var MoodEnum;
-(function (MoodEnum) {
-    MoodEnum[MoodEnum["Sad"] = 1] = "Sad";
-    MoodEnum[MoodEnum["SemiSad"] = 2] = "SemiSad";
-    MoodEnum[MoodEnum["Neutral"] = 3] = "Neutral";
-    MoodEnum[MoodEnum["SemiHappy"] = 4] = "SemiHappy";
-    MoodEnum[MoodEnum["Happy"] = 5] = "Happy";
-})(MoodEnum = exports.MoodEnum || (exports.MoodEnum = {}));
-var ActivityEnum;
-(function (ActivityEnum) {
-    ActivityEnum[ActivityEnum["Run"] = 0] = "Run";
-    ActivityEnum[ActivityEnum["Walk"] = 1] = "Walk";
-    ActivityEnum[ActivityEnum["Cycling"] = 2] = "Cycling";
-    ActivityEnum[ActivityEnum["Swim"] = 3] = "Swim";
-    ActivityEnum[ActivityEnum["Other"] = 4] = "Other";
-})(ActivityEnum = exports.ActivityEnum || (exports.ActivityEnum = {}));
-var InjectionMethod;
-(function (InjectionMethod) {
-    InjectionMethod["PenHalf"] = "Pen-half";
-    InjectionMethod["PenWhole"] = "Pen-whole";
-    InjectionMethod["Pump"] = "Pump";
-})(InjectionMethod = exports.InjectionMethod || (exports.InjectionMethod = {}));
-var Language;
-(function (Language) {
-    Language["da"] = "da";
-    Language["en"] = "en";
-    Language["de"] = "de";
-    Language["es"] = "es";
-    Language["it"] = "it";
-    Language["fr"] = "fr";
-})(Language = exports.Language || (exports.Language = {}));
-var ActivityInterval;
-(function (ActivityInterval) {
-    ActivityInterval["fromZero"] = "fromZero";
-    ActivityInterval["fromThirty"] = "fromThirty";
-    ActivityInterval["fromFortysix"] = "fromFortysix";
-})(ActivityInterval = exports.ActivityInterval || (exports.ActivityInterval = {}));
+exports.RecommendationReminders = exports.BgLevel = exports.RecommendationErrorEnum = exports.TwoOptionModalTestIds = exports.TransferToLogbookTestIds = exports.RemeasureTestIds = exports.RecommendationModalTestIds = exports.RecommendedInsulinTestIds = exports.RecommendedCarbsTestIds = exports.RecentInsulinTestIds = exports.LimitationMessageTestIds = exports.HeaderTestIds = exports.ActivityTestIds = void 0;
+var ActivityTestIds;
+(function (ActivityTestIds) {
+    ActivityTestIds["ActivityReduction"] = "activity-reduction-percentage";
+})(ActivityTestIds = exports.ActivityTestIds || (exports.ActivityTestIds = {}));
+var HeaderTestIds;
+(function (HeaderTestIds) {
+    HeaderTestIds["ExitCalculation"] = "exit-calculation-button";
+})(HeaderTestIds = exports.HeaderTestIds || (exports.HeaderTestIds = {}));
+var LimitationMessageTestIds;
+(function (LimitationMessageTestIds) {
+    LimitationMessageTestIds["OkButton"] = "limitation-message-ok-button";
+})(LimitationMessageTestIds = exports.LimitationMessageTestIds || (exports.LimitationMessageTestIds = {}));
+var RecentInsulinTestIds;
+(function (RecentInsulinTestIds) {
+    RecentInsulinTestIds["No"] = "recent-insulin-no";
+    RecentInsulinTestIds["Yes"] = "recent-insulin-yes";
+})(RecentInsulinTestIds = exports.RecentInsulinTestIds || (exports.RecentInsulinTestIds = {}));
+var RecommendedCarbsTestIds;
+(function (RecommendedCarbsTestIds) {
+    RecommendedCarbsTestIds["RecommendedCarbs"] = "recommended-carbs";
+    RecommendedCarbsTestIds["EditRecommendedCarbs"] = "edit-recommended-carbs";
+    RecommendedCarbsTestIds["InvisibleCarbInput"] = "invisible-recommended-carbs-input";
+    RecommendedCarbsTestIds["EnteredCarbs"] = "entered-carbs";
+    RecommendedCarbsTestIds["RemoveRecommendation"] = "remove-carb-recommendation";
+    RecommendedCarbsTestIds["TotalCarbs"] = "total-carbs";
+})(RecommendedCarbsTestIds = exports.RecommendedCarbsTestIds || (exports.RecommendedCarbsTestIds = {}));
+var RecommendedInsulinTestIds;
+(function (RecommendedInsulinTestIds) {
+    RecommendedInsulinTestIds["EditRecommendedInsulin"] = "edit-recommended-insulin";
+    RecommendedInsulinTestIds["InvisibleInsulinInput"] = "invisible-recommended-insulin-input";
+    RecommendedInsulinTestIds["ShownInsulinText"] = "shown-insulin-text";
+})(RecommendedInsulinTestIds = exports.RecommendedInsulinTestIds || (exports.RecommendedInsulinTestIds = {}));
+var RecommendationModalTestIds;
+(function (RecommendationModalTestIds) {
+    RecommendationModalTestIds["DeclineCarbs"] = "recommendation-modal-decline-carbs";
+    RecommendationModalTestIds["AcceptCarbs"] = "recommendation-modal-accept-carbs";
+    RecommendationModalTestIds["OkButton"] = "recommendation-modal-ok-button";
+    RecommendationModalTestIds["SuggestedCarbs"] = "recommendation-modal-suggested-carbs";
+})(RecommendationModalTestIds = exports.RecommendationModalTestIds || (exports.RecommendationModalTestIds = {}));
+var RemeasureTestIds;
+(function (RemeasureTestIds) {
+    RemeasureTestIds["RemeasureSlider"] = "remeasure-slider";
+})(RemeasureTestIds = exports.RemeasureTestIds || (exports.RemeasureTestIds = {}));
+var TransferToLogbookTestIds;
+(function (TransferToLogbookTestIds) {
+    TransferToLogbookTestIds["TransferButton"] = "transfer-to-logbook-button";
+})(TransferToLogbookTestIds = exports.TransferToLogbookTestIds || (exports.TransferToLogbookTestIds = {}));
+var TwoOptionModalTestIds;
+(function (TwoOptionModalTestIds) {
+    TwoOptionModalTestIds["ExitButton"] = "exit-two-option-modal";
+    TwoOptionModalTestIds["FirstOption"] = "first-option-button";
+    TwoOptionModalTestIds["SecondOption"] = "second-option-button";
+})(TwoOptionModalTestIds = exports.TwoOptionModalTestIds || (exports.TwoOptionModalTestIds = {}));
 var RecommendationErrorEnum;
 (function (RecommendationErrorEnum) {
     RecommendationErrorEnum[RecommendationErrorEnum["ActivityDuration"] = 0] = "ActivityDuration";
@@ -48,25 +64,20 @@ var RecommendationErrorEnum;
     RecommendationErrorEnum[RecommendationErrorEnum["ActivityType"] = 5] = "ActivityType";
     RecommendationErrorEnum[RecommendationErrorEnum["BolusInsulinDose"] = 6] = "BolusInsulinDose";
     RecommendationErrorEnum[RecommendationErrorEnum["BolusInsulinSecondsPassed"] = 7] = "BolusInsulinSecondsPassed";
-    RecommendationErrorEnum[RecommendationErrorEnum["CarbohydrateLimit"] = 8] = "CarbohydrateLimit";
-    RecommendationErrorEnum[RecommendationErrorEnum["InsulinSensitivity"] = 9] = "InsulinSensitivity";
-    RecommendationErrorEnum[RecommendationErrorEnum["InsulinToCarbsRatio"] = 10] = "InsulinToCarbsRatio";
-    RecommendationErrorEnum[RecommendationErrorEnum["CurrentBGL"] = 11] = "CurrentBGL";
-    RecommendationErrorEnum[RecommendationErrorEnum["CurrentBKL"] = 12] = "CurrentBKL";
-    RecommendationErrorEnum[RecommendationErrorEnum["TargetBGL"] = 13] = "TargetBGL";
-    RecommendationErrorEnum[RecommendationErrorEnum["UserReminder"] = 14] = "UserReminder";
-    RecommendationErrorEnum[RecommendationErrorEnum["Language"] = 15] = "Language";
-    RecommendationErrorEnum[RecommendationErrorEnum["InjectionMethod"] = 16] = "InjectionMethod";
-    RecommendationErrorEnum[RecommendationErrorEnum["BloodKetoneUnit"] = 17] = "BloodKetoneUnit";
-    RecommendationErrorEnum[RecommendationErrorEnum["BloodGlucoseUnit"] = 18] = "BloodGlucoseUnit";
+    RecommendationErrorEnum[RecommendationErrorEnum["RecentBolus"] = 8] = "RecentBolus";
+    RecommendationErrorEnum[RecommendationErrorEnum["CarbohydrateLimit"] = 9] = "CarbohydrateLimit";
+    RecommendationErrorEnum[RecommendationErrorEnum["InsulinSensitivity"] = 10] = "InsulinSensitivity";
+    RecommendationErrorEnum[RecommendationErrorEnum["InsulinToCarbsRatio"] = 11] = "InsulinToCarbsRatio";
+    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 Milliseconds;
-(function (Milliseconds) {
-    Milliseconds[Milliseconds["Second"] = 1000] = "Second";
-    Milliseconds[Milliseconds["Minute"] = 60000] = "Minute";
-    Milliseconds[Milliseconds["Hour"] = 3600000] = "Hour";
-    Milliseconds[Milliseconds["Day"] = 86400000] = "Day";
-})(Milliseconds = exports.Milliseconds || (exports.Milliseconds = {}));
 var BgLevel;
 (function (BgLevel) {
     BgLevel[BgLevel["SevereHypoglycemia"] = 0] = "SevereHypoglycemia";

package/src/types/enum.ts

@@ -1,39 +1,68 @@
-export enum MoodEnum {
-	Sad = 1,
-	SemiSad = 2,
-	Neutral = 3,
-	SemiHappy = 4,
-	Happy = 5,
+export enum ActivityTestIds {
+	ActivityReduction = `activity-reduction-percentage`,
 }
 
-export enum ActivityEnum {
-	Run,
-	Walk,
-	Cycling,
-	Swim,
-	Other,
+export enum HeaderTestIds {
+	ExitCalculation = `exit-calculation-button`,
 }
 
-export enum InjectionMethod {
-	PenHalf = "Pen-half",
-	PenWhole = "Pen-whole",
-	Pump = "Pump",
+export enum LimitationMessageTestIds {
+	OkButton = `limitation-message-ok-button`,
 }
 
-export enum Language {
-	da = "da",
-	en = "en",
-	de = "de",
-	es = "es",
-	it = "it",
-	fr = "fr",
+export enum RecentInsulinTestIds {
+	No = "recent-insulin-no",
+	Yes = "recent-insulin-yes",
 }
-export enum ActivityInterval {
-	fromZero = `fromZero`,
-	fromThirty = `fromThirty`,
-	fromFortysix = `fromFortysix`,
+
+export enum RecommendedCarbsTestIds {
+	RecommendedCarbs = "recommended-carbs",
+	EditRecommendedCarbs = `edit-recommended-carbs`,
+	InvisibleCarbInput = `invisible-recommended-carbs-input`,
+	EnteredCarbs = "entered-carbs",
+	RemoveRecommendation = `remove-carb-recommendation`,
+	TotalCarbs = "total-carbs",
+}
+
+export enum RecommendedInsulinTestIds {
+	EditRecommendedInsulin = `edit-recommended-insulin`,
+	InvisibleInsulinInput = `invisible-recommended-insulin-input`,
+	ShownInsulinText = `shown-insulin-text`,
+}
+
+export enum RecommendationModalTestIds {
+	DeclineCarbs = "recommendation-modal-decline-carbs",
+	AcceptCarbs = "recommendation-modal-accept-carbs",
+	OkButton = "recommendation-modal-ok-button",
+	SuggestedCarbs = `recommendation-modal-suggested-carbs`,
+}
+
+export enum RemeasureTestIds {
+	RemeasureSlider = `remeasure-slider`,
 }
 
+export enum TransferToLogbookTestIds {
+	TransferButton = "transfer-to-logbook-button",
+}
+
+export enum TwoOptionModalTestIds {
+	ExitButton = `exit-two-option-modal`,
+	FirstOption = `first-option-button`,
+	SecondOption = `second-option-button`,
+}
+
+export type TestIdEnum =
+	| ActivityTestIds
+	| HeaderTestIds
+	| LimitationMessageTestIds
+	| RecentInsulinTestIds
+	| RecommendedCarbsTestIds
+	| RecommendedInsulinTestIds
+	| RecommendationModalTestIds
+	| RemeasureTestIds
+	| TransferToLogbookTestIds
+	| TwoOptionModalTestIds;
+
 export enum RecommendationErrorEnum {
 	ActivityDuration,
 	ActivityTargetBGL,
@@ -43,9 +72,11 @@ export enum RecommendationErrorEnum {
 	ActivityType,
 	BolusInsulinDose,
 	BolusInsulinSecondsPassed,
+	RecentBolus,
 	CarbohydrateLimit,
 	InsulinSensitivity,
 	InsulinToCarbsRatio,
+	LatestLogbook6HoursBGL,
 	CurrentBGL,
 	CurrentBKL,
 	TargetBGL,
@@ -56,13 +87,6 @@ export enum RecommendationErrorEnum {
 	BloodGlucoseUnit,
 }
 
-export enum Milliseconds {
-	Second = 1000,
-	Minute = 60000,
-	Hour = 3600000,
-	Day = 86400000,
-}
-
 export enum BgLevel {
 	SevereHypoglycemia,
 	Hypoglycemia,

package/src/types/types.d.ts

@@ -1,29 +1,15 @@
-import { ActivityEnum, MoodEnum } from "./enum";
-export interface logbookEntry {
-    uuid: string;
-    entry_timestamp: string;
-    server_timestamp?: Date;
-    client_timestamp: string;
-    overwritten_by_id?: string | null;
-    settings_uuid: string;
-    client_version: number;
-    server_version?: number;
-    device_and_os?: string;
-    insulin_suggested_units: number | null;
-    insulin_entered_units: number;
-    carbohydrates_suggested_grams: number | null;
-    carbohydrates_entered_grams: number;
-    blood_glucose_millimolar: number | null;
-    mood: MoodEnum | null;
-    event_uuid: string | null;
-    is_deleted: Date | null;
-    utc_timezone_offset?: string | null;
-}
+import { Activity, BolusCalculator, Logbook } from "@hedia/types";
 export interface IInterval {
     min: number;
     max: number;
 }
 export interface IActivityDisplayProps {
-    activityTitle?: string;
-    activityType: ActivityEnum;
+    activityTitle: string | null;
+    activityType: Activity.Enums.ActivityEnum | null;
 }
+export declare type IActivityParams = BolusCalculator.Types.IActivityParams;
+export declare type logbookEntry = Logbook.Types.ILogbookEntry;
+export declare type IRecommendationParams = BolusCalculator.Types.IRecommendationParams;
+export declare type ReductionType = Activity.Types.ReductionType;
+export declare type ActivitySettings = Activity.Types.ActivitySettings;
+export declare type IRecentBolus = BolusCalculator.Types.IRecentBolus;

package/src/types/types.ts

@@ -1,32 +1,16 @@
-import { ActivityEnum, MoodEnum } from "./enum";
-
-// tslint:disable-next-line: interface-name class-name
-export interface logbookEntry {
-	uuid: string;
-	entry_timestamp: string; // The date where the entry appears when the user look at their logbook in the app
-	server_timestamp?: Date;
-	client_timestamp: string; // The time when the entry was created by the user on their phone
-	overwritten_by_id?: string | null;
-	settings_uuid: string;
-	client_version: number;
-	server_version?: number;
-	device_and_os?: string;
-	insulin_suggested_units: number | null;
-	insulin_entered_units: number;
-	carbohydrates_suggested_grams: number | null;
-	carbohydrates_entered_grams: number;
-	blood_glucose_millimolar: number | null;
-	mood: MoodEnum | null;
-	event_uuid: string | null;
-	is_deleted: Date | null;
-	utc_timezone_offset?: string | null;
-}
+import { Activity, BolusCalculator, Logbook } from "@hedia/types";
 
 export interface IInterval {
 	min: number;
 	max: number;
 }
 export interface IActivityDisplayProps {
-	activityTitle?: string;
-	activityType: ActivityEnum;
+	activityTitle: string | null;
+	activityType: Activity.Enums.ActivityEnum | null;
 }
+export type IActivityParams = BolusCalculator.Types.IActivityParams;
+export type logbookEntry = Logbook.Types.ILogbookEntry;
+export type IRecommendationParams = BolusCalculator.Types.IRecommendationParams;
+export type ReductionType = Activity.Types.ReductionType;
+export type ActivitySettings = Activity.Types.ActivitySettings;
+export type IRecentBolus = BolusCalculator.Types.IRecentBolus;

package/src/utils/AttentionMessages.d.ts

@@ -1,6 +1,3 @@
-import "moment/locale/da";
-import "moment/locale/de";
-import "moment/locale/es";
 export declare class AttentionMessage {
     static SevereHypoglycemia: () => string;
     static Hypoglycemia: () => string;
@@ -21,7 +18,7 @@ export declare class Messages {
     static InsulinKetones: () => string;
     static RecommendationWasLimited: () => string;
     static RecommendationWasLimitedActivity: (activityReduction: number) => string;
-    static InsulinInputWasLimited: (activityReduction?: number) => string;
+    static InsulinInputWasLimited: (activityReduction: number | null) => string;
     static TimeoutPrompTitle: () => string;
     static TimeoutRecommendationNotVisible: () => string;
     static TimeoutRecommendationVisible: (date: Date) => string;

package/src/utils/AttentionMessages.jsx

@@ -1,35 +1,12 @@
 "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;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Messages = exports.addPostponeActivityMessageUnder5MMOL = exports.AttentionMessage = void 0;
-const Calculator = __importStar(require("@hedia/recommendation-calculator"));
+const types_1 = require("@hedia/types");
 const macro_1 = require("@lingui/macro");
 const moment_1 = __importDefault(require("moment"));
-// tslint:disable: no-import-side-effect
-require("moment/locale/da");
-require("moment/locale/de");
-require("moment/locale/es");
 const i18nUtils_1 = require("../locale/i18nUtils");
 class AttentionMessage {
 }
@@ -45,8 +22,9 @@ function addPostponeActivityMessageUnder5MMOL(message) {
     return `${message}${`\n`}${Messages.PostponePhysicalActivityUnder5MMOL()}`;
 }
 exports.addPostponeActivityMessageUnder5MMOL = addPostponeActivityMessageUnder5MMOL;
+const SAFETY_INSULIN_LIMIT = types_1.BolusCalculator.Constants.SAFETY_INSULIN_LIMIT;
 function getLimitedValue(reduction) {
-    return Calculator.SAFETY_INSULIN_LIMIT - Calculator.SAFETY_INSULIN_LIMIT * reduction;
+    return SAFETY_INSULIN_LIMIT - SAFETY_INSULIN_LIMIT * reduction;
 }
 class Messages {
 }
@@ -58,18 +36,18 @@ Messages.PostponePhysicalActivity = () => i18nUtils_1.i18n._(macro_1.t `If it is
 Messages.PostponePhysicalActivityUnder5MMOL = () => i18nUtils_1.i18n._(macro_1.t `Consider not to initiate physical activity before your blood glucose level is within the recommended ranges prior to physical activity.`);
 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.
-			Hedia never recommends more than ${Calculator.SAFETY_INSULIN_LIMIT} units of insulin per calculation.`);
+Messages.RecommendationWasLimited = () => i18nUtils_1.i18n._(macro_1.t `Your recommendation would have been higher than ${SAFETY_INSULIN_LIMIT} units of insulin, but it has been limited for safety reasons.
+			Hedia never recommends more than ${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}
+			Hedia never recommends more than ${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.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
+    ? i18nUtils_1.i18n._(macro_1.t `Hedia doesn't support more than ${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.`);
+    : i18nUtils_1.i18n._(macro_1.t `Hedia does not support more than ${SAFETY_INSULIN_LIMIT} units of insulin per calculation.`);
 Messages.TimeoutPrompTitle = () => i18nUtils_1.i18n._(macro_1.t `More than 15 minutes has passed since this calculation was started.`);
 Messages.TimeoutRecommendationNotVisible = () => i18nUtils_1.i18n._(macro_1.t `Please go through the calculation steps with new measurements to ensure a safe recommendation.`);
 Messages.TimeoutRecommendationVisible = (date) => {

package/src/utils/AttentionMessages.tsx

@@ -1,10 +1,6 @@
-import * as Calculator from "@hedia/recommendation-calculator";
+import { BolusCalculator } from "@hedia/types";
 import { t } from "@lingui/macro";
 import moment from "moment";
-// tslint:disable: no-import-side-effect
-import "moment/locale/da";
-import "moment/locale/de";
-import "moment/locale/es";
 import { i18n } from "../locale/i18nUtils";
 
 export class AttentionMessage {
@@ -21,8 +17,11 @@ export class AttentionMessage {
 export function addPostponeActivityMessageUnder5MMOL(message: AttentionMessage): string {
 	return `${message}${`\n`}${Messages.PostponePhysicalActivityUnder5MMOL()}`;
 }
+
+const SAFETY_INSULIN_LIMIT = BolusCalculator.Constants.SAFETY_INSULIN_LIMIT;
+
 function getLimitedValue(reduction: number): number {
-	return Calculator.SAFETY_INSULIN_LIMIT - Calculator.SAFETY_INSULIN_LIMIT * reduction;
+	return SAFETY_INSULIN_LIMIT - SAFETY_INSULIN_LIMIT * reduction;
 }
 
 export class Messages {
@@ -43,29 +42,25 @@ 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.
-			Hedia never recommends more than ${Calculator.SAFETY_INSULIN_LIMIT} units of insulin per calculation.`,
+			t`Your recommendation would have been higher than ${SAFETY_INSULIN_LIMIT} units of insulin, but it has been limited for safety reasons.
+			Hedia never recommends more than ${SAFETY_INSULIN_LIMIT} units of insulin per calculation.`,
 		);
 	public static RecommendationWasLimitedActivity = (activityReduction: number): string =>
 		i18n._(
 			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}
+			Hedia never recommends more than ${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)}.`,
 		);
-	public static InsulinInputWasLimited = (activityReduction?: number): string =>
+	public static InsulinInputWasLimited = (activityReduction: number | null): string =>
 		activityReduction
 			? i18n._(
-					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
+					t`Hedia doesn't support more than ${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.`,
 			  )
-			: i18n._(
-					t`Hedia does not support more than ${Calculator.SAFETY_INSULIN_LIMIT} units of insulin per calculation.`,
-			  );
+			: i18n._(t`Hedia does not support more than ${SAFETY_INSULIN_LIMIT} units of insulin per calculation.`);
 	public static TimeoutPrompTitle = (): string =>
 		i18n._(t`More than 15 minutes has passed since this calculation was started.`);
 	public static TimeoutRecommendationNotVisible = (): string =>

package/src/utils/RecommendationError.d.ts

@@ -13,10 +13,12 @@ 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;
 export declare const BolusInsulinSecondsPassedError: () => RecommendationError;
+export declare const RecentBolusError: () => RecommendationError;
 export declare const UserReminderError: () => RecommendationError;
 export declare const InjectionMethodError: () => RecommendationError;
 export declare const LanguageError: () => RecommendationError;

package/src/utils/RecommendationError.jsx

@@ -1,29 +1,11 @@
 "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.BloodGlucoseUnitError = exports.BloodKetoneUnitError = exports.LanguageError = exports.InjectionMethodError = exports.UserReminderError = 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;
-const Calculator = __importStar(require("@hedia/recommendation-calculator"));
+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");
 const enum_1 = require("../types/enum");
+const SAFETY_INSULIN_LIMIT = types_1.BolusCalculator.Constants.SAFETY_INSULIN_LIMIT;
 class RecommendationError extends Error {
     constructor(message, type) {
         super(message);
@@ -31,22 +13,45 @@ class RecommendationError extends Error {
     }
 }
 exports.RecommendationError = RecommendationError;
-exports.ActivitySettingsError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Please verify that your activity settings are set up correctly.`), enum_1.RecommendationErrorEnum.ActivitySettings);
-exports.ActivityDurationError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator only supports activities with a duration of maximum 60 minutes.`), enum_1.RecommendationErrorEnum.ActivityDuration);
-exports.ActivityDateError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Hedia Calculator does not support activities that finished more than 4 hours ago.`), enum_1.RecommendationErrorEnum.ActivityDate);
-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.ActivityTypeError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support your activity type value`), enum_1.RecommendationErrorEnum.ActivityType);
-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.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.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.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.BolusInsulinDoseError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support an insulin dose greater than ${Calculator.SAFETY_INSULIN_LIMIT} units`), enum_1.RecommendationErrorEnum.BolusInsulinDose);
-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);
-exports.LanguageError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support your current language.`), enum_1.RecommendationErrorEnum.Language);
-exports.BloodKetoneUnitError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support your current blood ketone unit.`), enum_1.RecommendationErrorEnum.BloodKetoneUnit);
-exports.BloodGlucoseUnitError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support your current blood glucose unit.`), enum_1.RecommendationErrorEnum.BloodGlucoseUnit);
+const ActivitySettingsError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Please verify that your activity settings are set up correctly.`), enum_1.RecommendationErrorEnum.ActivitySettings);
+exports.ActivitySettingsError = ActivitySettingsError;
+const ActivityDurationError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator only supports activities with a duration of maximum 60 minutes.`), enum_1.RecommendationErrorEnum.ActivityDuration);
+exports.ActivityDurationError = ActivityDurationError;
+const ActivityDateError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Hedia Calculator does not support activities that finished more than 4 hours ago.`), enum_1.RecommendationErrorEnum.ActivityDate);
+exports.ActivityDateError = ActivityDateError;
+const ActivityIntensityError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support your activity intensity value`), enum_1.RecommendationErrorEnum.ActivityIntensity);
+exports.ActivityIntensityError = ActivityIntensityError;
+const ActivityTypeError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support your activity type value`), enum_1.RecommendationErrorEnum.ActivityType);
+exports.ActivityTypeError = ActivityTypeError;
+const 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.ActivityTargetBGLError = ActivityTargetBGLError;
+const 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.CarbohydrateLimitError = CarbohydrateLimitError;
+const InsulinSensitivityError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Please verify that your insulin sensitivity value is correct.`), enum_1.RecommendationErrorEnum.InsulinSensitivity);
+exports.InsulinSensitivityError = InsulinSensitivityError;
+const 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.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);
+exports.TargetBGLError = TargetBGLError;
+const BolusInsulinDoseError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support an insulin dose greater than ${SAFETY_INSULIN_LIMIT} units`), enum_1.RecommendationErrorEnum.BolusInsulinDose);
+exports.BolusInsulinDoseError = BolusInsulinDoseError;
+const 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.BolusInsulinSecondsPassedError = BolusInsulinSecondsPassedError;
+const RecentBolusError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator could not find your recent boluses`), enum_1.RecommendationErrorEnum.RecentBolus);
+exports.RecentBolusError = RecentBolusError;
+const UserReminderError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Please verify your notifications settings.`), enum_1.RecommendationErrorEnum.UserReminder);
+exports.UserReminderError = UserReminderError;
+const InjectionMethodError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support your injection method.`), enum_1.RecommendationErrorEnum.InjectionMethod);
+exports.InjectionMethodError = InjectionMethodError;
+const LanguageError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support your current language.`), enum_1.RecommendationErrorEnum.Language);
+exports.LanguageError = LanguageError;
+const BloodKetoneUnitError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support your current blood ketone unit.`), enum_1.RecommendationErrorEnum.BloodKetoneUnit);
+exports.BloodKetoneUnitError = BloodKetoneUnitError;
+const BloodGlucoseUnitError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support your current blood glucose unit.`), enum_1.RecommendationErrorEnum.BloodGlucoseUnit);
+exports.BloodGlucoseUnitError = BloodGlucoseUnitError;