@hedia/recommendation-screen 2.2.0-alpha.13 → 2.2.0-alpha.15

package/dist/src/RecommendationScreen.d.ts

@@ -10,6 +10,15 @@ export interface IResult {
     /** The actual amount (of insulin in units or carbohydrates in grams) */
     entered: number | null;
 }
+/** Represents forecast data */
+export interface IForecast {
+    /** The forecasted glucose value to display. */
+    forecastedGlucose: number | null;
+    /** Forecasted time value to display. */
+    forecastTime: string | null;
+    /** Latest CGM value to display. */
+    latestCGMReading: number | null;
+}
 export interface IRecommendationProps {
     /** The blood glucose measurement unit that the user prefers. */
     bloodGlucoseUnit: BloodGlucoseUnit;
@@ -29,14 +38,8 @@ export interface IRecommendationProps {
     latestLogbookFrom6Hours: Logbook.Types.ILogbookEntry | null;
     /** The properties of the entered activity that are not used for making the calculation itself, but will be used on the recommendation screen. */
     activityDisplayProps: IActivityDisplayProps | null;
-    /** The forecasted glucose value to display. */
-    forecastedGlucose: number | null;
-    /** Forecasted time value to display. */
-    forecastTime: string | null;
-    /** Latest CGM value to display. */
-    latestCGMReading: number | null;
-    /** Check if the forecasted glucose value is in very low range.  */
-    isForecastedGlucoseVeryLow: boolean;
+    /** Forecast data received from the app */
+    forecast: IForecast | null;
     /**
      * Callback function taking a single boolean argument and returning nothing.
      * To be called when the user decides on a presented carbohydrate recommendation.

package/dist/src/RecommendationScreen.js

@@ -460,7 +460,7 @@ export default class RecommendationScreen extends React.Component {
         const carbRecommendation = carbRecommendationProp !== null ? Math.round(carbRecommendationProp) : null;
         const recommendedCarbs = enteredCarbs ?? carbRecommendation;
         const isModalOpen = showExitModal || showLimitationMessage || showTimeoutModal;
-        const { activityDisplayProps, bloodGlucoseUnit, bloodKetoneUnit, calculatorParams, currentBKL, injectionMethod, language, onRecentInsulinYes, forecastedGlucose, forecastTime, latestCGMReading, isForecastedGlucoseVeryLow, } = this.props;
+        const { activityDisplayProps, bloodGlucoseUnit, bloodKetoneUnit, calculatorParams, currentBKL, injectionMethod, language, onRecentInsulinYes, forecast, } = this.props;
         const { activity, currentBGL, carbohydrates: providedCarbs } = calculatorParams;
         const displayedBGL = currentBGL ? Utils.displayedBGLValue(currentBGL, bloodGlucoseUnit) : null;
         const displayedBKL = currentBKL !== null && bloodKetoneUnit ? Utils.displayedBKLValue(currentBKL, bloodKetoneUnit) : null;
@@ -474,7 +474,7 @@ export default class RecommendationScreen extends React.Component {
             }}>
 						<Header exitCallback={this.onExit}/>
 						<InfoBars label={i18n._(t `Active Insulin`)} value={activeInsulin ? `${activeInsulin.toFixed(1)}` : null} unit={i18n._(t `units`)} showNullAsDash={false} testID={{ unitID: ActiveInsulinUnitTestID, valueID: ActiveInsulinValueTestID }}/>
-						{forecastedGlucose && !isForecastedGlucoseVeryLow ? (<ForecastInfoBar label={i18n._(t `Forecasted Glucose`)} value={forecastedGlucose} unit={bloodGlucoseUnit} forecastTime={forecastTime} latestCGMReading={latestCGMReading} testID={{ unitID: FGUnitTestID, valueID: FGValueTestID }}/>) : (<InfoBars label={i18n._(t `Blood Glucose Level`)} value={displayedBGL} unit={bloodGlucoseUnit} showNullAsDash={true} testID={{ unitID: BGUnitTestID, valueID: BGValueTestID }}/>)}
+						{forecast ? (<ForecastInfoBar label={i18n._(t `Forecasted Glucose`)} forecast={forecast} unit={bloodGlucoseUnit} testID={{ unitID: FGUnitTestID, valueID: FGValueTestID }}/>) : (<InfoBars label={i18n._(t `Blood Glucose Level`)} value={displayedBGL} unit={bloodGlucoseUnit} showNullAsDash={true} testID={{ unitID: BGUnitTestID, valueID: BGValueTestID }}/>)}
 						<InfoBars label={i18n._(t `Blood Ketone Level`)} value={displayedBKL} unit={bloodKetoneUnit} showNullAsDash={true} testID={{ unitID: BKUnitTestID, valueID: BKValueTestID }}/>
 						<View style={containerStyles.calcContainer}>
 							<View style={containerStyles.calcMargin}>
@@ -485,7 +485,7 @@ export default class RecommendationScreen extends React.Component {
 						</View>
 						{activity && activityDisplayProps && (<Activity activity={activity} activityType={activityDisplayProps.activityType} activityTitle={activityDisplayProps.activityTitle} activityReduction={activityReduction}/>)}
 						<Remeasure onSliderChange={this.updateRemeasureTime} remeasureTime={remeasureTime}/>
-						{!isRecommendationDisplayed ? (<RecentInsulin onRecentInsulinYes={onRecentInsulinYes} onRecentInsulinNo={this.handleNoRecentInsulin}/>) : (<RecommendedInsulin injectionMethod={injectionMethod} insulinRecommendation={insulinRecommendation} enteredInsulin={enteredInsulin} activityReduction={activityReduction} updateRecommendedInsulin={this.updateInsulinRecommendation} isForecastedGlucoseVeryLow={isForecastedGlucoseVeryLow}/>)}
+						{!isRecommendationDisplayed ? (<RecentInsulin onRecentInsulinYes={onRecentInsulinYes} onRecentInsulinNo={this.handleNoRecentInsulin}/>) : (<RecommendedInsulin injectionMethod={injectionMethod} insulinRecommendation={insulinRecommendation} enteredInsulin={enteredInsulin} activityReduction={activityReduction} updateRecommendedInsulin={this.updateInsulinRecommendation} forecast={forecast}/>)}
 						<Emotion moodSelected={this.handleMoodSelected} currentMood={selectedMood}/>
 						<SaveButton visible={isRecommendationDisplayed} transfer={this.handleTransfer}/>
 						<RecommendationModal isVisible={recommendationModal} suggestedCarbohydrates={carbRecommendationProp} attentionMessage={this.getBGLevelAttentionMessage()} limitationMessage={this.getLimitationAttentionMessage()} onClickOkButton={this.hideAttentionModal} onAcceptCarbohydrates={this.acceptCarbRecommendation} onDeclineCarbohydrates={this.declineCarbRecommendation}/>

package/dist/src/components/ForecastInfoBar.d.ts

@@ -1,17 +1,14 @@
+/// <reference types="react" />
 import { BloodGlucoseUnit } from "@hedia/types";
-import React from "react";
+import { IForecast } from "../RecommendationScreen";
 import { Testing } from "../types/enum";
 export interface IProps {
     /** The display label that describes the value to the user. */
     label: string;
     /** The value to display. */
-    value: number;
+    forecast: IForecast;
     /** Unit label to print after the value. */
     unit: BloodGlucoseUnit;
-    /** Forecast time value to display. */
-    forecastTime: string | null;
-    /** Latest CGM value to display. */
-    latestCGMReading: number | null;
     /**  optional object that contains as properties a valueID and a unitID */
     testID?: {
         valueID: Testing.Id.InfoBarTestIds.Value;
@@ -19,18 +16,7 @@ export interface IProps {
     };
 }
 /** A standard panel to display some data that the user entered. */
-export default class ForecastInfoBar extends React.Component<IProps> {
-    /**
-     * Determine the unit string to be displayed in the infobar.
-     *
-     * @returns The string to display as the unit in the infobar
-     */
-    displayUnit: () => string;
-    /**
-     * @returns JSX element to display a card with the entered value.
-     */
-    render(): JSX.Element;
-}
+declare const ForecastInfoBar: (props: IProps) => JSX.Element;
 /** @internal */
 export declare const infoStyles: {
     container: {
@@ -115,3 +101,4 @@ export declare const infoStyles: {
         marginBottom: number;
     };
 };
+export default ForecastInfoBar;

package/dist/src/components/ForecastInfoBar.js

@@ -8,61 +8,57 @@ import { Utils } from "../utils/Utils";
 import TextBold from "./text/TextBold";
 import TextRegular from "./text/TextRegular";
 /** A standard panel to display some data that the user entered. */
-export default class ForecastInfoBar extends React.Component {
+const ForecastInfoBar = (props) => {
+    const { testID, label, unit, forecast } = props;
     /**
      * Determine the unit string to be displayed in the infobar.
      *
      * @returns The string to display as the unit in the infobar
      */
-    displayUnit = () => {
-        const { unit } = this.props;
-        return Utils.formatUnit(unit);
-    };
+    // tslint:disable-next-line: no-shadowed-variable
+    const displayUnit = (unit) => Utils.formatUnit(unit);
+    const { border, container, forecastDot, forecastSubtitle, forecastText, forecastTime, gradient, labelContainer, row, unitContainer, units, value, valueContainer, valueUnitContainer, } = infoStyles;
     /**
      * @returns JSX element to display a card with the entered value.
      */
-    render() {
-        const { testID, label, latestCGMReading } = this.props;
-        const { border, container, forecastDot, forecastSubtitle, forecastText, forecastTime, gradient, labelContainer, row, unitContainer, units, value, valueContainer, valueUnitContainer, } = infoStyles;
-        return (<View style={container}>
-				<LinearGradient style={gradient} colors={[`#8B38F5`, `#D593E5`]} useAngle={true} angle={170}>
-					<View style={border}>
-						<View style={row}>
-							<View style={labelContainer}>
-								<TextBold style={infoStyles.label}>{label}</TextBold>
+    return (<View style={container}>
+			<LinearGradient style={gradient} colors={[`#8B38F5`, `#D593E5`]} useAngle={true} angle={170}>
+				<View style={border}>
+					<View style={row}>
+						<View style={labelContainer}>
+							<TextBold style={infoStyles.label}>{label}</TextBold>
+						</View>
+						<View style={valueUnitContainer}>
+							<View style={valueContainer}>
+								<TextBold style={value} testID={testID?.valueID}>
+									{forecast.forecastedGlucose}
+								</TextBold>
 							</View>
-							<View style={valueUnitContainer}>
-								<View style={valueContainer}>
-									<TextBold style={value} testID={testID?.valueID}>
-										{this.props.value}
-									</TextBold>
-								</View>
-								<View style={unitContainer}>
-									<TextRegular style={units} testID={testID?.unitID}>
-										{this.displayUnit()}
-									</TextRegular>
-								</View>
+							<View style={unitContainer}>
+								<TextRegular style={units} testID={testID?.unitID}>
+									{displayUnit(unit)}
+								</TextRegular>
 							</View>
 						</View>
+					</View>
 
-						<View style={row}>
-							<View style={forecastSubtitle}>
-								<LinearGradient colors={[`#8B38F5`, `#D593E5`]} useAngle={true} angle={135} style={forecastDot}/>
-								<TextRegular style={forecastText}>{i18n._(t `Forecast time:`)}</TextRegular>
-								<TextRegular style={forecastTime}>{this.props.forecastTime}</TextRegular>
-							</View>
+					<View style={row}>
+						<View style={forecastSubtitle}>
+							<LinearGradient colors={[`#8B38F5`, `#D593E5`]} useAngle={true} angle={135} style={forecastDot}/>
+							<TextRegular style={forecastText}>{i18n._(t `Forecast time:`)}</TextRegular>
+							<TextRegular style={forecastTime}>{forecast.forecastTime}</TextRegular>
 						</View>
+					</View>
 
-						<View style={row}>
-							<TextRegular style={infoStyles.currentCGM}>
-								{i18n._(t `Current glucose: ${latestCGMReading} ${this.displayUnit()}`)}
-							</TextRegular>
-						</View>
+					<View style={row}>
+						<TextRegular style={infoStyles.currentCGM}>
+							{i18n._(t `Current glucose: ${forecast.latestCGMReading} ${displayUnit(unit)}`)}
+						</TextRegular>
 					</View>
-				</LinearGradient>
-			</View>);
-    }
-}
+				</View>
+			</LinearGradient>
+		</View>);
+};
 const { width } = Dimensions.get(`screen`);
 /** @internal */
 export const infoStyles = StyleSheet.create({
@@ -148,3 +144,4 @@ export const infoStyles = StyleSheet.create({
         marginBottom: 5,
     },
 });
+export default ForecastInfoBar;

package/dist/src/components/RecommendedInsulin.d.ts

@@ -1,5 +1,6 @@
 import { UserSettings } from "@hedia/types";
 import React from "react";
+import { IForecast } from "../RecommendationScreen";
 export interface IProps {
     /** The amount of insulin in units to display to the user as a recommendation. */
     insulinRecommendation: number;
@@ -14,7 +15,7 @@ export interface IProps {
     /** Used to determine how the insulin amount should be rounded. */
     injectionMethod: UserSettings.Enums.InjectionMethod;
     /** Used to show different text depending on different insulin ranges. */
-    isForecastedGlucoseVeryLow: boolean;
+    forecast: IForecast | null;
     /**
      * Callback function taking a number as argument and giving no return value.
      * To be called with the new value every time the content of the insulin input field gets changed.

package/dist/src/components/RecommendedInsulin.js

@@ -102,11 +102,12 @@ export default class RecommendedInsulin extends React.Component {
      * and using an InvisibleNumberInput component to enable input when the insulin amount is tapped.
      */
     render = () => {
-        const shownInsulin = this.state.partialInput ?? this.props.insulinRecommendation ?? `0`;
+        const { forecast, insulinRecommendation } = this.props;
+        const shownInsulin = this.state.partialInput ?? insulinRecommendation ?? `0`;
         const { container, editText, title, recommendedContainer, valueContainer, value, units, editButton } = styles;
-        const titleText = this.props.isForecastedGlucoseVeryLow
-            ? i18n._(t `Recommended amount of rapid-acting insulin for immidiate injection`)
-            : i18n._(t `Recommended amount of rapid-acting insulin for immidiate injection based on forecasted glucose`);
+        const titleText = forecast
+            ? i18n._(t `Recommended amount of rapid-acting insulin for immidiate injection based on forecasted glucose`)
+            : i18n._(t `Recommended amount of rapid-acting insulin for immidiate injection`);
         return (<>
 				<TouchableOpacity testID={RecommendedInsulinTestIds.EditRecommendedInsulin} onPress={this.handleOnPress}>
 					<LinearGradient style={container} colors={[colors.purple, colors.blue]} useAngle={true} angle={315}>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hedia/recommendation-screen",
-  "version": "2.2.0-alpha.13",
+  "version": "2.2.0-alpha.15",
   "description": "Hedia Recommendation Screen for Bolus and Carbohydrates",
   "main": "dist/index.js",
   "files": [