@hedia/recommendation-screen 1.5.2 → 1.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (27) hide show
  1. package/.idea/workspace.xml +118 -189
  2. package/package.json +2 -1
  3. package/src/RecommendationScreen.d.ts +6 -3
  4. package/src/RecommendationScreen.jsx +8 -6
  5. package/src/RecommendationScreen.tsx +32 -9
  6. package/src/components/InfoBars.d.ts +4 -1
  7. package/src/components/InfoBars.jsx +19 -3
  8. package/src/components/InfoBars.tsx +19 -4
  9. package/src/locale/da/messages.js +1 -1
  10. package/src/locale/da/messages.po +30 -18
  11. package/src/locale/en/messages.js +1 -1
  12. package/src/locale/en/messages.po +30 -18
  13. package/src/types/enum.d.ts +7 -9
  14. package/src/types/enum.js +8 -11
  15. package/src/types/enum.ts +3 -6
  16. package/src/utils/Constants.d.ts +5 -2
  17. package/src/utils/Constants.js +6 -3
  18. package/src/utils/Constants.ts +6 -2
  19. package/src/utils/RecommendationError.d.ts +3 -1
  20. package/src/utils/RecommendationError.jsx +4 -2
  21. package/src/utils/RecommendationError.tsx +12 -2
  22. package/src/utils/Utils.d.ts +6 -1
  23. package/src/utils/Utils.js +17 -2
  24. package/src/utils/Utils.ts +21 -3
  25. package/src/utils/Validations.d.ts +5 -2
  26. package/src/utils/Validations.js +28 -7
  27. package/src/utils/Validations.ts +32 -7
package/.idea/workspace.xml CHANGED
@@ -28,9 +28,7 @@
28
28
  </select>
29
29
  </component>
30
30
  <component name="ChangeListManager">
31
- <list default="true" id="bceba75c-4c15-4bdc-9b41-023f63a30830" name="Default Changelist" comment="">
32
- <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
33
- </list>
31
+ <list default="true" id="bceba75c-4c15-4bdc-9b41-023f63a30830" name="Default Changelist" comment="" />
34
32
  <option name="SHOW_DIALOG" value="false" />
35
33
  <option name="HIGHLIGHT_CONFLICTS" value="true" />
36
34
  <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -186,7 +184,13 @@
186
184
  <workItem from="1601281403601" duration="8208000" />
187
185
  <workItem from="1601639667672" duration="898000" />
188
186
  <workItem from="1601883005682" duration="10293000" />
189
- <workItem from="1601903898220" duration="1722000" />
187
+ <workItem from="1601903898220" duration="2267000" />
188
+ <workItem from="1601972128642" duration="3574000" />
189
+ <workItem from="1602064836586" duration="3708000" />
190
+ <workItem from="1602165438473" duration="1424000" />
191
+ <workItem from="1602229083262" duration="2936000" />
192
+ <workItem from="1602239231218" duration="802000" />
193
+ <workItem from="1602487231033" duration="6016000" />
190
194
  </task>
191
195
  <servers />
192
196
  </component>
@@ -194,179 +198,102 @@
194
198
  <option name="version" value="3" />
195
199
  <option name="exactExcludedFiles">
196
200
  <list>
197
- <option value="$PROJECT_DIR$/App.d.ts" />
198
- <option value="$PROJECT_DIR$/App.jsx" />
199
- <option value="$PROJECT_DIR$/index.js" />
200
- <option value="$PROJECT_DIR$/index.d.ts" />
201
- <option value="$PROJECT_DIR$/src/RecommendationScreen.d.ts" />
202
- <option value="$PROJECT_DIR$/src/RecommendationScreen.jsx" />
203
- <option value="$PROJECT_DIR$/src/types/enum.d.ts" />
204
- <option value="$PROJECT_DIR$/src/types/enum.js" />
205
- <option value="$PROJECT_DIR$/src/types/types.d.ts" />
206
- <option value="$PROJECT_DIR$/src/types/types.js" />
207
- <option value="$PROJECT_DIR$/src/utils/AttentionMessages.jsx" />
208
- <option value="$PROJECT_DIR$/src/utils/RecommendationUtils.js" />
209
- <option value="$PROJECT_DIR$/src/utils/AttentionMessages.d.ts" />
210
- <option value="$PROJECT_DIR$/src/utils/RecommendationError.jsx" />
211
- <option value="$PROJECT_DIR$/src/utils/RecommendationUtils.d.ts" />
212
- <option value="$PROJECT_DIR$/src/utils/RecommendationError.d.ts" />
213
- <option value="$PROJECT_DIR$/src/utils/Constants.d.ts" />
214
- <option value="$PROJECT_DIR$/src/utils/Utils.d.ts" />
215
- <option value="$PROJECT_DIR$/src/utils/Validations.js" />
216
- <option value="$PROJECT_DIR$/src/utils/Utils.js" />
217
- <option value="$PROJECT_DIR$/src/utils/Validations.d.ts" />
218
- <option value="$PROJECT_DIR$/src/utils/Constants.js" />
219
- <option value="$PROJECT_DIR$/src/locale/i18nUtils.js" />
220
- <option value="$PROJECT_DIR$/src/locale/i18nUtils.d.ts" />
221
- <option value="$PROJECT_DIR$/src/components/RecommendationModal.jsx" />
222
- <option value="$PROJECT_DIR$/src/components/RecentInsulin.d.ts" />
223
- <option value="$PROJECT_DIR$/src/components/Header.jsx" />
224
- <option value="$PROJECT_DIR$/src/components/InvisibleNumberInput.jsx" />
225
- <option value="$PROJECT_DIR$/src/components/InfoBars.jsx" />
226
- <option value="$PROJECT_DIR$/src/components/InvisibleNumberInput.d.ts" />
227
- <option value="$PROJECT_DIR$/src/components/RecommendedCarbs.d.ts" />
228
- <option value="$PROJECT_DIR$/src/components/TwoOptionModal.d.ts" />
229
- <option value="$PROJECT_DIR$/src/components/Remeasure.d.ts" />
230
- <option value="$PROJECT_DIR$/src/components/Header.d.ts" />
231
- <option value="$PROJECT_DIR$/src/components/InfoBars.d.ts" />
232
- <option value="$PROJECT_DIR$/src/components/RecommendationModal.d.ts" />
233
- <option value="$PROJECT_DIR$/src/components/RecommendedInsulin.jsx" />
234
- <option value="$PROJECT_DIR$/src/components/TransferToLogbook.d.ts" />
235
- <option value="$PROJECT_DIR$/src/components/LimitationMessage.jsx" />
236
- <option value="$PROJECT_DIR$/src/components/LineSeparator.jsx" />
237
- <option value="$PROJECT_DIR$/src/components/TwoOptionModal.jsx" />
238
- <option value="$PROJECT_DIR$/src/components/RecentInsulin.jsx" />
239
- <option value="$PROJECT_DIR$/src/components/LineSeparator.d.ts" />
201
+ <option value="$PROJECT_DIR$/src/__tests__/components/Remeasure.test.d.ts" />
202
+ <option value="$PROJECT_DIR$/src/__tests__/components/TransferToLogbook.test.d.ts" />
203
+ <option value="$PROJECT_DIR$/src/__tests__/components/RecommendedCarbs.test.jsx" />
204
+ <option value="$PROJECT_DIR$/src/__tests__/components/Emotion.test.d.ts" />
205
+ <option value="$PROJECT_DIR$/src/__tests__/components/MoodIcon.test.d.ts" />
206
+ <option value="$PROJECT_DIR$/src/__tests__/components/InvisibleNumberInput.test.d.ts" />
207
+ <option value="$PROJECT_DIR$/src/__tests__/components/InfoBars.test.jsx" />
208
+ <option value="$PROJECT_DIR$/src/__tests__/components/Remeasure.test.jsx" />
209
+ <option value="$PROJECT_DIR$/src/__tests__/Translate.test.jsx" />
210
+ <option value="$PROJECT_DIR$/src/__tests__/Utils.test.d.ts" />
211
+ <option value="$PROJECT_DIR$/src/__tests__/RecommendationUtils.test.d.ts" />
212
+ <option value="$PROJECT_DIR$/src/__tests__/RecommendationScreen.test.d.ts" />
213
+ <option value="$PROJECT_DIR$/src/__tests__/components/RecommendationModal.test.d.ts" />
214
+ <option value="$PROJECT_DIR$/src/__tests__/components/RecommendedCarbs.test.d.ts" />
215
+ <option value="$PROJECT_DIR$/src/__tests__/components/InfoBars.test.d.ts" />
216
+ <option value="$PROJECT_DIR$/src/__tests__/components/MoodIcon.test.jsx" />
217
+ <option value="$PROJECT_DIR$/src/__tests__/Utils.test.js" />
218
+ <option value="$PROJECT_DIR$/src/__tests__/RecommendationScreen.test.jsx" />
219
+ <option value="$PROJECT_DIR$/src/__tests__/Validations.test.d.ts" />
220
+ <option value="$PROJECT_DIR$/src/__tests__/Validations.test.js" />
221
+ <option value="$PROJECT_DIR$/src/__tests__/utils.jsx" />
222
+ <option value="$PROJECT_DIR$/src/__tests__/Translate.test.d.ts" />
223
+ <option value="$PROJECT_DIR$/src/__tests__/utils.d.ts" />
224
+ <option value="$PROJECT_DIR$/src/__tests__/RecommendationUtils.test.js" />
240
225
  <option value="$PROJECT_DIR$/src/components/Remeasure.jsx" />
241
- <option value="$PROJECT_DIR$/src/components/RecommendedInsulin.d.ts" />
242
- <option value="$PROJECT_DIR$/src/components/TransferToLogbook.jsx" />
243
- <option value="$PROJECT_DIR$/src/components/LimitationMessage.d.ts" />
226
+ <option value="$PROJECT_DIR$/src/components/LineSeparator.d.ts" />
227
+ <option value="$PROJECT_DIR$/src/components/RecentInsulin.jsx" />
228
+ <option value="$PROJECT_DIR$/src/components/TwoOptionModal.jsx" />
244
229
  <option value="$PROJECT_DIR$/src/components/RecommendedCarbs.jsx" />
245
- <option value="$PROJECT_DIR$/src/components/mood/MoodIcon.jsx" />
246
- <option value="$PROJECT_DIR$/src/components/mood/Emotion.jsx" />
247
- <option value="$PROJECT_DIR$/src/components/mood/MoodIcon.d.ts" />
248
- <option value="$PROJECT_DIR$/src/components/mood/Emotion.d.ts" />
249
- <option value="$PROJECT_DIR$/src/components/activity/ActivityIcon.d.ts" />
250
- <option value="$PROJECT_DIR$/src/components/activity/Activity.d.ts" />
251
- <option value="$PROJECT_DIR$/src/components/activity/ActivityIntensity.d.ts" />
252
- <option value="$PROJECT_DIR$/src/components/activity/Activity.jsx" />
253
- <option value="$PROJECT_DIR$/src/components/activity/ActivityIcon.jsx" />
254
- <option value="$PROJECT_DIR$/src/components/activity/ActivityIntensity.jsx" />
255
- <option value="$PROJECT_DIR$/App.d.ts" />
256
- <option value="$PROJECT_DIR$/App.jsx" />
257
- <option value="$PROJECT_DIR$/index.d.ts" />
258
- <option value="$PROJECT_DIR$/src/RecommendationScreen.d.ts" />
259
- <option value="$PROJECT_DIR$/src/RecommendationScreen.jsx" />
260
- <option value="$PROJECT_DIR$/src/types/enum.d.ts" />
261
- <option value="$PROJECT_DIR$/src/types/enum.js" />
262
- <option value="$PROJECT_DIR$/src/types/types.d.ts" />
263
- <option value="$PROJECT_DIR$/src/types/types.js" />
264
- <option value="$PROJECT_DIR$/src/utils/AttentionMessages.jsx" />
265
- <option value="$PROJECT_DIR$/src/utils/RecommendationUtils.js" />
266
- <option value="$PROJECT_DIR$/src/utils/AttentionMessages.d.ts" />
267
- <option value="$PROJECT_DIR$/src/utils/RecommendationError.jsx" />
268
- <option value="$PROJECT_DIR$/src/utils/RecommendationUtils.d.ts" />
269
- <option value="$PROJECT_DIR$/src/utils/RecommendationError.d.ts" />
270
- <option value="$PROJECT_DIR$/src/utils/Constants.d.ts" />
271
- <option value="$PROJECT_DIR$/src/utils/Utils.d.ts" />
272
- <option value="$PROJECT_DIR$/src/utils/Validations.js" />
273
- <option value="$PROJECT_DIR$/src/utils/Utils.js" />
274
- <option value="$PROJECT_DIR$/src/utils/Validations.d.ts" />
275
- <option value="$PROJECT_DIR$/src/utils/Constants.js" />
276
- <option value="$PROJECT_DIR$/src/locale/i18nUtils.js" />
277
- <option value="$PROJECT_DIR$/src/locale/i18nUtils.d.ts" />
278
- <option value="$PROJECT_DIR$/src/components/RecommendationModal.jsx" />
279
- <option value="$PROJECT_DIR$/src/components/RecentInsulin.d.ts" />
280
- <option value="$PROJECT_DIR$/src/components/Header.jsx" />
281
- <option value="$PROJECT_DIR$/src/components/InvisibleNumberInput.jsx" />
282
- <option value="$PROJECT_DIR$/src/components/InfoBars.jsx" />
283
- <option value="$PROJECT_DIR$/src/components/InvisibleNumberInput.d.ts" />
284
- <option value="$PROJECT_DIR$/src/components/RecommendedCarbs.d.ts" />
285
- <option value="$PROJECT_DIR$/src/components/TwoOptionModal.d.ts" />
286
- <option value="$PROJECT_DIR$/src/components/Remeasure.d.ts" />
287
- <option value="$PROJECT_DIR$/src/components/Header.d.ts" />
288
- <option value="$PROJECT_DIR$/src/components/InfoBars.d.ts" />
230
+ <option value="$PROJECT_DIR$/src/components/LimitationMessage.d.ts" />
231
+ <option value="$PROJECT_DIR$/src/components/TransferToLogbook.jsx" />
232
+ <option value="$PROJECT_DIR$/src/components/RecommendedInsulin.d.ts" />
289
233
  <option value="$PROJECT_DIR$/src/components/RecommendationModal.d.ts" />
290
- <option value="$PROJECT_DIR$/src/components/RecommendedInsulin.jsx" />
291
- <option value="$PROJECT_DIR$/src/components/TransferToLogbook.d.ts" />
292
- <option value="$PROJECT_DIR$/src/components/LimitationMessage.jsx" />
234
+ <option value="$PROJECT_DIR$/src/components/InfoBars.d.ts" />
235
+ <option value="$PROJECT_DIR$/src/components/Header.d.ts" />
236
+ <option value="$PROJECT_DIR$/src/components/Remeasure.d.ts" />
293
237
  <option value="$PROJECT_DIR$/src/components/LineSeparator.jsx" />
294
- <option value="$PROJECT_DIR$/src/components/TwoOptionModal.jsx" />
295
- <option value="$PROJECT_DIR$/src/components/RecentInsulin.jsx" />
296
- <option value="$PROJECT_DIR$/src/components/LineSeparator.d.ts" />
297
- <option value="$PROJECT_DIR$/src/components/Remeasure.jsx" />
298
- <option value="$PROJECT_DIR$/src/components/RecommendedInsulin.d.ts" />
299
- <option value="$PROJECT_DIR$/src/components/TransferToLogbook.jsx" />
300
- <option value="$PROJECT_DIR$/src/components/LimitationMessage.d.ts" />
301
- <option value="$PROJECT_DIR$/src/components/RecommendedCarbs.jsx" />
302
- <option value="$PROJECT_DIR$/src/components/mood/MoodIcon.jsx" />
303
- <option value="$PROJECT_DIR$/src/components/mood/Emotion.jsx" />
304
- <option value="$PROJECT_DIR$/src/components/mood/MoodIcon.d.ts" />
305
- <option value="$PROJECT_DIR$/src/components/mood/Emotion.d.ts" />
306
- <option value="$PROJECT_DIR$/src/components/activity/ActivityIcon.d.ts" />
307
- <option value="$PROJECT_DIR$/src/components/activity/Activity.d.ts" />
308
- <option value="$PROJECT_DIR$/src/components/activity/ActivityIntensity.d.ts" />
309
- <option value="$PROJECT_DIR$/src/components/activity/Activity.jsx" />
310
- <option value="$PROJECT_DIR$/src/components/activity/ActivityIcon.jsx" />
311
- <option value="$PROJECT_DIR$/src/components/activity/ActivityIntensity.jsx" />
312
- <option value="$PROJECT_DIR$/App.d.ts" />
313
- <option value="$PROJECT_DIR$/App.jsx" />
314
- <option value="$PROJECT_DIR$/index.js" />
315
- <option value="$PROJECT_DIR$/index.d.ts" />
316
- <option value="$PROJECT_DIR$/src/RecommendationScreen.d.ts" />
317
- <option value="$PROJECT_DIR$/src/RecommendationScreen.jsx" />
318
- <option value="$PROJECT_DIR$/src/types/enum.d.ts" />
319
- <option value="$PROJECT_DIR$/src/types/enum.js" />
320
- <option value="$PROJECT_DIR$/src/types/types.d.ts" />
238
+ <option value="$PROJECT_DIR$/src/components/LimitationMessage.jsx" />
239
+ <option value="$PROJECT_DIR$/src/components/TransferToLogbook.d.ts" />
240
+ <option value="$PROJECT_DIR$/src/components/RecommendedInsulin.jsx" />
241
+ <option value="$PROJECT_DIR$/src/components/InvisibleNumberInput.jsx" />
242
+ <option value="$PROJECT_DIR$/src/components/Header.jsx" />
243
+ <option value="$PROJECT_DIR$/src/components/RecentInsulin.d.ts" />
244
+ <option value="$PROJECT_DIR$/src/components/RecommendationModal.jsx" />
245
+ <option value="$PROJECT_DIR$/src/components/TwoOptionModal.d.ts" />
246
+ <option value="$PROJECT_DIR$/src/components/RecommendedCarbs.d.ts" />
247
+ <option value="$PROJECT_DIR$/src/components/InvisibleNumberInput.d.ts" />
248
+ <option value="$PROJECT_DIR$/src/components/InfoBars.jsx" />
249
+ <option value="$PROJECT_DIR$/src/utils/Constants.js" />
250
+ <option value="$PROJECT_DIR$/src/utils/Validations.d.ts" />
251
+ <option value="$PROJECT_DIR$/src/utils/Utils.js" />
252
+ <option value="$PROJECT_DIR$/src/utils/Validations.js" />
321
253
  <option value="$PROJECT_DIR$/src/types/types.js" />
322
- <option value="$PROJECT_DIR$/src/utils/AttentionMessages.jsx" />
323
- <option value="$PROJECT_DIR$/src/utils/RecommendationUtils.js" />
324
- <option value="$PROJECT_DIR$/src/utils/AttentionMessages.d.ts" />
254
+ <option value="$PROJECT_DIR$/src/types/types.d.ts" />
255
+ <option value="$PROJECT_DIR$/src/types/enum.js" />
256
+ <option value="$PROJECT_DIR$/src/types/enum.d.ts" />
325
257
  <option value="$PROJECT_DIR$/src/utils/RecommendationError.jsx" />
326
- <option value="$PROJECT_DIR$/src/utils/RecommendationUtils.d.ts" />
327
- <option value="$PROJECT_DIR$/src/utils/RecommendationError.d.ts" />
328
- <option value="$PROJECT_DIR$/src/utils/Constants.d.ts" />
258
+ <option value="$PROJECT_DIR$/src/utils/AttentionMessages.d.ts" />
259
+ <option value="$PROJECT_DIR$/src/utils/RecommendationUtils.js" />
260
+ <option value="$PROJECT_DIR$/src/utils/AttentionMessages.jsx" />
329
261
  <option value="$PROJECT_DIR$/src/utils/Utils.d.ts" />
330
- <option value="$PROJECT_DIR$/src/utils/Validations.js" />
331
- <option value="$PROJECT_DIR$/src/utils/Utils.js" />
332
- <option value="$PROJECT_DIR$/src/utils/Validations.d.ts" />
333
- <option value="$PROJECT_DIR$/src/utils/Constants.js" />
334
- <option value="$PROJECT_DIR$/src/locale/i18nUtils.js" />
335
- <option value="$PROJECT_DIR$/src/locale/i18nUtils.d.ts" />
336
- <option value="$PROJECT_DIR$/src/components/RecommendationModal.jsx" />
337
- <option value="$PROJECT_DIR$/src/components/RecentInsulin.d.ts" />
338
- <option value="$PROJECT_DIR$/src/components/Header.jsx" />
339
- <option value="$PROJECT_DIR$/src/components/InvisibleNumberInput.jsx" />
340
- <option value="$PROJECT_DIR$/src/components/InfoBars.jsx" />
341
- <option value="$PROJECT_DIR$/src/components/InvisibleNumberInput.d.ts" />
342
- <option value="$PROJECT_DIR$/src/components/RecommendedCarbs.d.ts" />
343
- <option value="$PROJECT_DIR$/src/components/TwoOptionModal.d.ts" />
344
- <option value="$PROJECT_DIR$/src/components/Remeasure.d.ts" />
345
- <option value="$PROJECT_DIR$/src/components/Header.d.ts" />
346
- <option value="$PROJECT_DIR$/src/components/InfoBars.d.ts" />
347
- <option value="$PROJECT_DIR$/src/components/RecommendationModal.d.ts" />
348
- <option value="$PROJECT_DIR$/src/components/RecommendedInsulin.jsx" />
349
- <option value="$PROJECT_DIR$/src/components/TransferToLogbook.d.ts" />
350
- <option value="$PROJECT_DIR$/src/components/LimitationMessage.jsx" />
351
- <option value="$PROJECT_DIR$/src/components/LineSeparator.jsx" />
352
- <option value="$PROJECT_DIR$/src/components/TwoOptionModal.jsx" />
353
- <option value="$PROJECT_DIR$/src/components/RecentInsulin.jsx" />
354
- <option value="$PROJECT_DIR$/src/components/LineSeparator.d.ts" />
355
- <option value="$PROJECT_DIR$/src/components/Remeasure.jsx" />
356
- <option value="$PROJECT_DIR$/src/components/RecommendedInsulin.d.ts" />
357
- <option value="$PROJECT_DIR$/src/components/TransferToLogbook.jsx" />
358
- <option value="$PROJECT_DIR$/src/components/LimitationMessage.d.ts" />
359
- <option value="$PROJECT_DIR$/src/components/RecommendedCarbs.jsx" />
360
- <option value="$PROJECT_DIR$/src/components/mood/MoodIcon.jsx" />
262
+ <option value="$PROJECT_DIR$/src/utils/Constants.d.ts" />
263
+ <option value="$PROJECT_DIR$/src/utils/RecommendationError.d.ts" />
264
+ <option value="$PROJECT_DIR$/src/utils/RecommendationUtils.d.ts" />
361
265
  <option value="$PROJECT_DIR$/src/components/mood/Emotion.jsx" />
362
- <option value="$PROJECT_DIR$/src/components/mood/MoodIcon.d.ts" />
266
+ <option value="$PROJECT_DIR$/src/components/mood/MoodIcon.jsx" />
267
+ <option value="$PROJECT_DIR$/src/components/activity/ActivityIntensity.jsx" />
268
+ <option value="$PROJECT_DIR$/src/components/activity/ActivityIcon.jsx" />
269
+ <option value="$PROJECT_DIR$/src/locale/i18nUtils.d.ts" />
270
+ <option value="$PROJECT_DIR$/src/locale/i18nUtils.js" />
363
271
  <option value="$PROJECT_DIR$/src/components/mood/Emotion.d.ts" />
364
- <option value="$PROJECT_DIR$/src/components/activity/ActivityIcon.d.ts" />
365
- <option value="$PROJECT_DIR$/src/components/activity/Activity.d.ts" />
366
- <option value="$PROJECT_DIR$/src/components/activity/ActivityIntensity.d.ts" />
272
+ <option value="$PROJECT_DIR$/src/components/mood/MoodIcon.d.ts" />
273
+ <option value="$PROJECT_DIR$/index.d.ts" />
274
+ <option value="$PROJECT_DIR$/index.js" />
275
+ <option value="$PROJECT_DIR$/App.jsx" />
276
+ <option value="$PROJECT_DIR$/App.d.ts" />
367
277
  <option value="$PROJECT_DIR$/src/components/activity/Activity.jsx" />
368
- <option value="$PROJECT_DIR$/src/components/activity/ActivityIcon.jsx" />
369
- <option value="$PROJECT_DIR$/src/components/activity/ActivityIntensity.jsx" />
278
+ <option value="$PROJECT_DIR$/src/components/activity/ActivityIntensity.d.ts" />
279
+ <option value="$PROJECT_DIR$/src/components/activity/Activity.d.ts" />
280
+ <option value="$PROJECT_DIR$/src/components/activity/ActivityIcon.d.ts" />
281
+ <option value="$PROJECT_DIR$/src/__tests__/components/Activity.test.jsx" />
282
+ <option value="$PROJECT_DIR$/src/__tests__/components/InvisibleNumberInput.test.jsx" />
283
+ <option value="$PROJECT_DIR$/src/__tests__/components/LimitationMessage.test.d.ts" />
284
+ <option value="$PROJECT_DIR$/src/__tests__/components/TwoOptionModal.test.jsx" />
285
+ <option value="$PROJECT_DIR$/src/RecommendationScreen.jsx" />
286
+ <option value="$PROJECT_DIR$/src/RecommendationScreen.d.ts" />
287
+ <option value="$PROJECT_DIR$/src/__tests__/components/TwoOptionModal.test.d.ts" />
288
+ <option value="$PROJECT_DIR$/src/__tests__/components/LimitationMessage.test.jsx" />
289
+ <option value="$PROJECT_DIR$/src/__tests__/components/Activity.test.d.ts" />
290
+ <option value="$PROJECT_DIR$/src/__tests__/components/Header.test.jsx" />
291
+ <option value="$PROJECT_DIR$/src/__tests__/components/Header.test.d.ts" />
292
+ <option value="$PROJECT_DIR$/src/__tests__/components/RecommendedInsulin.test.d.ts" />
293
+ <option value="$PROJECT_DIR$/src/__tests__/components/Emotion.test.jsx" />
294
+ <option value="$PROJECT_DIR$/src/__tests__/components/RecommendationModal.test.jsx" />
295
+ <option value="$PROJECT_DIR$/src/__tests__/components/TransferToLogbook.test.jsx" />
296
+ <option value="$PROJECT_DIR$/src/__tests__/components/RecommendedInsulin.test.jsx" />
370
297
  </list>
371
298
  </option>
372
299
  </component>
@@ -419,45 +346,46 @@
419
346
  <state x="1792" y="-66" width="3440" height="1159" key="DiffContextDialog/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1600171230341" />
420
347
  <state x="0" y="123" width="1792" height="897" key="DiffContextDialog/1792.-410.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1600096736067" />
421
348
  <state x="1792" y="-314" width="1920" height="865" key="DiffContextDialog/1792.-410.1920.1057/0.23.1792.1097@1792.-410.1920.1057" timestamp="1598603549140" />
422
- <state width="854" height="264" key="GridCell.Tab.0.bottom" timestamp="1601904320102">
349
+ <state width="1357" height="316" key="GridCell.Tab.0.bottom" timestamp="1602506188647">
423
350
  <screen x="0" y="23" width="1792" height="1097" />
424
351
  </state>
425
352
  <state width="1750" height="261" key="GridCell.Tab.0.bottom/-1920.-66.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1596194051670" />
426
- <state width="854" height="264" key="GridCell.Tab.0.bottom/0.23.1792.1097@0.23.1792.1097" timestamp="1601904320102" />
353
+ <state width="1357" height="316" key="GridCell.Tab.0.bottom/0.23.1792.1097@0.23.1792.1097" timestamp="1602506188647" />
427
354
  <state width="1750" height="383" key="GridCell.Tab.0.bottom/1792.-195.3440.1417/0.23.1792.1097@0.23.1792.1097" timestamp="1597945008184" />
428
- <state width="1678" height="261" key="GridCell.Tab.0.bottom/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1600192512277" />
355
+ <state width="1738" height="428" key="GridCell.Tab.0.bottom/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1602257501217" />
429
356
  <state width="1321" height="264" key="GridCell.Tab.0.bottom/1792.-410.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1600268308807" />
430
357
  <state width="1878" height="183" key="GridCell.Tab.0.bottom/1792.-410.1920.1057/0.23.1792.1097@1792.-410.1920.1057" timestamp="1599837918176" />
431
- <state width="854" height="264" key="GridCell.Tab.0.center" timestamp="1601904320101">
358
+ <state width="1357" height="316" key="GridCell.Tab.0.center" timestamp="1602506188646">
432
359
  <screen x="0" y="23" width="1792" height="1097" />
433
360
  </state>
434
361
  <state width="1750" height="261" key="GridCell.Tab.0.center/-1920.-66.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1596194051669" />
435
- <state width="854" height="264" key="GridCell.Tab.0.center/0.23.1792.1097@0.23.1792.1097" timestamp="1601904320101" />
362
+ <state width="1357" height="316" key="GridCell.Tab.0.center/0.23.1792.1097@0.23.1792.1097" timestamp="1602506188646" />
436
363
  <state width="1750" height="383" key="GridCell.Tab.0.center/1792.-195.3440.1417/0.23.1792.1097@0.23.1792.1097" timestamp="1597945008183" />
437
- <state width="1678" height="261" key="GridCell.Tab.0.center/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1600192512276" />
364
+ <state width="1738" height="428" key="GridCell.Tab.0.center/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1602257501216" />
438
365
  <state width="1321" height="264" key="GridCell.Tab.0.center/1792.-410.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1600268308807" />
439
366
  <state width="1878" height="183" key="GridCell.Tab.0.center/1792.-410.1920.1057/0.23.1792.1097@1792.-410.1920.1057" timestamp="1599837918175" />
440
- <state width="854" height="264" key="GridCell.Tab.0.left" timestamp="1601904320101">
367
+ <state width="1357" height="316" key="GridCell.Tab.0.left" timestamp="1602506188645">
441
368
  <screen x="0" y="23" width="1792" height="1097" />
442
369
  </state>
443
370
  <state width="1750" height="261" key="GridCell.Tab.0.left/-1920.-66.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1596194051668" />
444
- <state width="854" height="264" key="GridCell.Tab.0.left/0.23.1792.1097@0.23.1792.1097" timestamp="1601904320101" />
371
+ <state width="1357" height="316" key="GridCell.Tab.0.left/0.23.1792.1097@0.23.1792.1097" timestamp="1602506188645" />
445
372
  <state width="1750" height="383" key="GridCell.Tab.0.left/1792.-195.3440.1417/0.23.1792.1097@0.23.1792.1097" timestamp="1597945008182" />
446
- <state width="1678" height="261" key="GridCell.Tab.0.left/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1600192512276" />
373
+ <state width="1738" height="428" key="GridCell.Tab.0.left/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1602257501216" />
447
374
  <state width="1321" height="264" key="GridCell.Tab.0.left/1792.-410.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1600268308806" />
448
375
  <state width="1878" height="183" key="GridCell.Tab.0.left/1792.-410.1920.1057/0.23.1792.1097@1792.-410.1920.1057" timestamp="1599837918175" />
449
- <state width="854" height="264" key="GridCell.Tab.0.right" timestamp="1601904320102">
376
+ <state width="1357" height="316" key="GridCell.Tab.0.right" timestamp="1602506188646">
450
377
  <screen x="0" y="23" width="1792" height="1097" />
451
378
  </state>
452
379
  <state width="1750" height="261" key="GridCell.Tab.0.right/-1920.-66.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1596194051669" />
453
- <state width="854" height="264" key="GridCell.Tab.0.right/0.23.1792.1097@0.23.1792.1097" timestamp="1601904320102" />
380
+ <state width="1357" height="316" key="GridCell.Tab.0.right/0.23.1792.1097@0.23.1792.1097" timestamp="1602506188646" />
454
381
  <state width="1750" height="383" key="GridCell.Tab.0.right/1792.-195.3440.1417/0.23.1792.1097@0.23.1792.1097" timestamp="1597945008183" />
455
- <state width="1678" height="261" key="GridCell.Tab.0.right/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1600192512277" />
382
+ <state width="1738" height="428" key="GridCell.Tab.0.right/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1602257501217" />
456
383
  <state width="1321" height="264" key="GridCell.Tab.0.right/1792.-410.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1600268308807" />
457
384
  <state width="1878" height="183" key="GridCell.Tab.0.right/1792.-410.1920.1057/0.23.1792.1097@1792.-410.1920.1057" timestamp="1599837918176" />
458
- <state x="2340" y="-140" key="IDE.errors.dialog" timestamp="1599637300780">
459
- <screen x="1792" y="-410" width="1920" height="1057" />
385
+ <state x="511" y="303" key="IDE.errors.dialog" timestamp="1602487312159">
386
+ <screen x="0" y="23" width="1792" height="1097" />
460
387
  </state>
388
+ <state x="511" y="303" key="IDE.errors.dialog/0.23.1792.1097@0.23.1792.1097" timestamp="1602487312159" />
461
389
  <state x="511" y="303" key="IDE.errors.dialog/1792.-195.3440.1417/0.23.1792.1097@0.23.1792.1097" timestamp="1597308623997" />
462
390
  <state x="2773" y="167" key="IDE.errors.dialog/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1598973647546" />
463
391
  <state x="2340" y="-140" key="IDE.errors.dialog/1792.-410.1920.1057/0.23.1792.1097@1792.-410.1920.1057" timestamp="1599637300780" />
@@ -477,22 +405,23 @@
477
405
  <state x="2767" y="31" key="RollbackChangesDialog/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1598965839229" />
478
406
  <state x="508" y="198" key="RollbackChangesDialog/1792.-410.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1600074907578" />
479
407
  <state x="2336" y="-241" key="RollbackChangesDialog/1792.-410.1920.1057/0.23.1792.1097@1792.-410.1920.1057" timestamp="1599833353364" />
480
- <state x="2554" y="47" key="SettingsEditor" timestamp="1600695463879">
481
- <screen x="1792" y="-195" width="3440" height="1417" />
408
+ <state x="397" y="210" key="SettingsEditor" timestamp="1602499684439">
409
+ <screen x="0" y="23" width="1792" height="1097" />
482
410
  </state>
483
411
  <state x="397" y="210" key="SettingsEditor/-1920.-66.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1596110346829" />
412
+ <state x="397" y="210" key="SettingsEditor/0.23.1792.1097@0.23.1792.1097" timestamp="1602499684439" />
484
413
  <state x="2554" y="47" key="SettingsEditor/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1600695463879" />
485
414
  <state x="428" y="230" key="com.intellij.openapi.vcs.changes.SpecificFilesViewDialog" timestamp="1596103115204">
486
415
  <screen x="0" y="23" width="1792" height="1097" />
487
416
  </state>
488
417
  <state x="428" y="230" key="com.intellij.openapi.vcs.changes.SpecificFilesViewDialog/-1920.-66.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1596103115204" />
489
- <state x="559" y="310" width="1233" height="522" key="find.popup" timestamp="1601887937088">
418
+ <state x="559" y="310" width="1233" height="522" key="find.popup" timestamp="1602507247404">
490
419
  <screen x="0" y="23" width="1792" height="1097" />
491
420
  </state>
492
421
  <state x="559" y="310" width="1233" height="522" key="find.popup/-1920.-66.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1596116959250" />
493
- <state x="559" y="310" width="1233" height="522" key="find.popup/0.23.1792.1097@0.23.1792.1097" timestamp="1601887937088" />
422
+ <state x="559" y="310" width="1233" height="522" key="find.popup/0.23.1792.1097@0.23.1792.1097" timestamp="1602507247404" />
494
423
  <state x="558" y="310" width="1234" height="580" key="find.popup/1792.-195.3440.1417/0.23.1792.1097@0.23.1792.1097" timestamp="1597748403272" />
495
- <state x="2491" y="140" width="2369" height="738" key="find.popup/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1601639674275" />
424
+ <state x="2491" y="140" width="2369" height="738" key="find.popup/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1602165450739" />
496
425
  <state x="558" y="310" width="1234" height="580" key="find.popup/1792.-410.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1600240789477" />
497
426
  <state x="2390" y="-133" width="1322" height="582" key="find.popup/1792.-410.1920.1057/0.23.1792.1097@1792.-410.1920.1057" timestamp="1599833255779" />
498
427
  <state width="600" height="440" key="javadoc.popup" timestamp="1600096493461">
@@ -503,13 +432,13 @@
503
432
  <screen x="1792" y="-410" width="1920" height="1057" />
504
433
  </state>
505
434
  <state x="2477" y="-143" key="refactoring.ChangeSignatureDialog/1792.-410.1920.1057/0.23.1792.1097@1792.-410.1920.1057" timestamp="1599040674381" />
506
- <state x="360" y="268" width="670" height="676" key="search.everywhere.popup" timestamp="1601904301010">
435
+ <state x="360" y="268" width="670" height="676" key="search.everywhere.popup" timestamp="1602507231608">
507
436
  <screen x="0" y="23" width="1792" height="1097" />
508
437
  </state>
509
438
  <state x="360" y="268" width="670" height="676" key="search.everywhere.popup/-1920.-66.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1596101738778" />
510
- <state x="360" y="268" width="670" height="676" key="search.everywhere.popup/0.23.1792.1097@0.23.1792.1097" timestamp="1601904301010" />
439
+ <state x="360" y="268" width="670" height="676" key="search.everywhere.popup/0.23.1792.1097@0.23.1792.1097" timestamp="1602507231608" />
511
440
  <state x="360" y="268" width="671" height="677" key="search.everywhere.popup/1792.-195.3440.1417/0.23.1792.1097@0.23.1792.1097" timestamp="1597748285464" />
512
- <state x="2484" y="121" width="1287" height="875" key="search.everywhere.popup/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1601639679448" />
441
+ <state x="2484" y="121" width="1287" height="875" key="search.everywhere.popup/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1601982106446" />
513
442
  <state x="360" y="268" width="671" height="677" key="search.everywhere.popup/1792.-410.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1600242616490" />
514
443
  <state x="2178" y="-174" width="718" height="652" key="search.everywhere.popup/1792.-410.1920.1057/0.23.1792.1097@1792.-410.1920.1057" timestamp="1599833679258" />
515
444
  </component>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hedia/recommendation-screen",
3
- "version": "1.5.2",
3
+ "version": "1.6.0",
4
4
  "description": "Hedia Recommendation Screen for Bolus and Carbohydrates",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -42,6 +42,7 @@
42
42
  "@babel/preset-react": "7.10.1",
43
43
  "@babel/preset-typescript": "7.10.1",
44
44
  "@hedia/recommendation-calculator": "1.3.0",
45
+ "@hedia/types": "1.0.2",
45
46
  "@lingui/babel-preset-react": "2.9.1",
46
47
  "@lingui/cli": "2.9.1",
47
48
  "@lingui/macro": "2.9.1",
package/src/RecommendationScreen.d.ts CHANGED
@@ -1,7 +1,8 @@
1
1
  import React from "react";
2
2
  import { AppStateStatus } from "react-native";
3
- import { BGUnit, InjectionMethod, Language, MoodEnum } from "./types/enum";
3
+ import { InjectionMethod, Language, MoodEnum } from "./types/enum";
4
4
  import * as Calculator from "@hedia/recommendation-calculator";
5
+ import { BloodGlucoseUnit, BloodKetonesUnit } from "@hedia/types";
5
6
  import { RecommendationError } from "./utils/RecommendationError";
6
7
  import { IActivityDisplayProps, logbookEntry } from "./types/types";
7
8
  import { AttentionMessage } from "./utils/AttentionMessages";
@@ -10,18 +11,20 @@ interface IResult {
10
11
  entered?: number;
11
12
  }
12
13
  export interface IRecommendationProps {
13
- units: BGUnit;
14
+ bloodGlucoseUnit: BloodGlucoseUnit;
14
15
  language: Language;
15
16
  userReminder: number;
16
17
  calculatorParams: Calculator.IRecommendationParams;
17
18
  injectionMethod: InjectionMethod;
19
+ currentBKL: number;
20
+ bloodKetoneUnit: BloodKetonesUnit;
18
21
  latestLogbookFrom6Hours: logbookEntry;
19
22
  activityDisplayProps: IActivityDisplayProps;
20
23
  carbRecommendationAnswer(carbRecommendationAnswer: boolean): void;
21
24
  closeCalculationCallback(): void;
22
25
  exitCallback(): void;
23
26
  onRecentInsulinYes(): void;
24
- transferToLogbook(carbs: IResult, insulin: IResult, reminder: number, recommendationDate: Date): void;
27
+ transferToLogbook(carbs: IResult, insulin: IResult, reminder: number, recommendationDate: Date, mood: MoodEnum): void;
25
28
  onError(error: RecommendationError): void;
26
29
  showBolusBar(toggle: boolean): void;
27
30
  restartCalculation(): void;
package/src/RecommendationScreen.jsx CHANGED
@@ -133,11 +133,11 @@ class RecommendationScreen extends react_1.default.Component {
133
133
  this.setState({ enteredInsulin });
134
134
  };
135
135
  this.handleTransfer = () => {
136
- const { enteredCarbs, enteredInsulin, insulinRecommendation, remeasureTime, showExitModal } = this.state;
136
+ const { enteredCarbs, enteredInsulin, insulinRecommendation, remeasureTime, showExitModal, selectedMood, } = this.state;
137
137
  const carbs = { suggested: this.suggestedCarbs, entered: enteredCarbs };
138
138
  const insulin = { suggested: insulinRecommendation, entered: enteredInsulin };
139
139
  showExitModal ? this.hideExitModal() : this.hideTimeoutModal();
140
- this.props.transferToLogbook(carbs, insulin, remeasureTime, this.recommendationDate);
140
+ this.props.transferToLogbook(carbs, insulin, remeasureTime, this.recommendationDate, selectedMood);
141
141
  };
142
142
  this.getBGLevelAttentionMessage = () => {
143
143
  const { calculatorParams, latestLogbookFrom6Hours } = this.props;
@@ -195,14 +195,16 @@ class RecommendationScreen extends react_1.default.Component {
195
195
  return <react_native_1.View style={containerStyles.container}/>;
196
196
  }
197
197
  const { activeInsulin, recommendationModal, carbRecommendation, enteredCarbs, enteredInsulin, insulinRecommendation, activityReduction, isRecommendationDisplayed, } = this.state;
198
- const { calculatorParams, units } = this.props;
198
+ const { calculatorParams, bloodGlucoseUnit, currentBKL, bloodKetoneUnit } = this.props;
199
199
  const { currentBGL, carbohydrates } = calculatorParams;
200
- const displayedBGL = units === enum_1.BGUnit.MMOL_L ? currentBGL : Utils_1.Utils.convertToMGDL(currentBGL);
200
+ const displayedBGL = Utils_1.Utils.displayedBGLValue(currentBGL, bloodGlucoseUnit);
201
+ const displayedBKL = Utils_1.Utils.displayedBKLValue(currentBKL, bloodKetoneUnit);
201
202
  return (<react_2.I18nProvider language={this.props.language} i18n={i18nUtils_1.i18n}>
202
203
  <react_native_1.ScrollView style={containerStyles.container} ref={(view) => (this.scrollView = view)}>
203
204
  <Header_1.default exitCallback={this.onExit}/>
204
- <InfoBars_1.default label={i18nUtils_1.i18n._(macro_1.t `Active Insulin`)} value={activeInsulin ? `${activeInsulin.toFixed(1)}` : null} units={i18nUtils_1.i18n._(macro_1.t `units`)} showNullAsDash={false}/>
205
- <InfoBars_1.default label={i18nUtils_1.i18n._(macro_1.t `Blood Glucose Level`)} value={currentBGL ? `${displayedBGL}` : null} units={this.props.units} showNullAsDash={true}/>
205
+ <InfoBars_1.default label={i18nUtils_1.i18n._(macro_1.t `Active Insulin`)} value={activeInsulin ? `${activeInsulin.toFixed(1)}` : null} unit={i18nUtils_1.i18n._(macro_1.t `units`)} showNullAsDash={false}/>
206
+ <InfoBars_1.default label={i18nUtils_1.i18n._(macro_1.t `Blood Glucose Level`)} value={currentBGL ? `${displayedBGL}` : null} unit={this.props.bloodGlucoseUnit} showNullAsDash={true}/>
207
+ <InfoBars_1.default label={i18nUtils_1.i18n._(macro_1.t `Blood Ketone Level`)} value={currentBKL ? `${displayedBKL}` : null} unit={this.props.bloodKetoneUnit} showNullAsDash={true}/>
206
208
  <react_native_1.View style={containerStyles.calcContainer}>
207
209
  <react_native_1.View style={containerStyles.calcMargin}>
208
210
  <react_native_1.View style={[