Philoul
|
6c8b4dfab0
|
Merge branch 'meallink' into meallink_ValueWithUnit
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
|
2021-03-29 22:39:12 +02:00 |
|
|
Philoul
|
e829a6918c
|
Fix uel after merge
|
2021-03-29 22:30:44 +02:00 |
|
|
Milos Kozak
|
cb298a2646
|
eliminate treatments cache from TreatmentsPlugin
|
2021-03-29 19:15:46 +02:00 |
|
|
Philoul
|
22384ef2e8
|
Merge branch 'Adrian_ValueWithUnit_Refactor' into meallink_ValueWithUnit
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
# automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
# automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt
# combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
# core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java
# core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt
# database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
# omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/ActiveBolus.java
|
2021-03-29 13:51:28 +02:00 |
|
|
Milos Kozak
|
f37e3ab4c2
|
Simplify IOB calculation call
|
2021-03-29 09:43:25 +02:00 |
|
|
Philoul
|
87fecfd255
|
Fix Build 2
|
2021-03-28 17:37:32 +02:00 |
|
|
Philoul
|
654ca35dd1
|
Merge branch 'UserEntryImprovement' into AdrianVWU_Update
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsUserEntryFragment.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
# core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormat.kt
# core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
# core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt
# database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
|
2021-03-28 17:04:52 +02:00 |
|
|
Milos Kozak
|
df1e2c53db
|
Bolus, Carbs, BolusCalcResult new way of upload to NS
|
2021-03-28 13:45:27 +02:00 |
|
|
Milos Kozak
|
4edf51d6ea
|
remove nsUpload call for TemporaryTargets
|
2021-03-26 16:23:47 +01:00 |
|
|
Milos Kozak
|
ff001b0add
|
remove MealLink.class
|
2021-03-25 23:52:08 +01:00 |
|
|
Milos Kozak
|
7f0fe881b6
|
DetailedBolusInfo, MealLink UI
|
2021-03-25 17:48:07 +01:00 |
|
|
Philoul
|
6e0d21a874
|
Add Source icon in UserEntryFragment, Update source in uel.log
|
2021-03-25 13:32:11 +01:00 |
|
|
AdrianLxM
|
d9aced595b
|
make new ValueWithUnit translatable
|
2021-03-25 03:23:28 +01:00 |
|
|
AdrianLxM
|
2da872bbfe
|
idea: value with unit as sealed class
|
2021-03-25 02:24:26 +01:00 |
|
|
Milos Kozak
|
616871c95c
|
prepare DetailedBolusInfo
|
2021-03-22 16:59:09 +01:00 |
|
|
AdrianLxM
|
fd2c072799
|
automation elements without injector
|
2021-03-20 01:27:04 +01:00 |
|
|
AdrianLxM
|
7d2e364c77
|
use UploadQueue through interface
|
2021-03-19 21:35:09 +01:00 |
|
|
Milos Kozak
|
8736f6db7e
|
Merge branch 'dev' into pull/393
|
2021-03-19 11:42:59 +01:00 |
|
|
Philoul
|
accfc24332
|
Optimize Actions
|
2021-03-17 22:45:08 +01:00 |
|
|
Milos Kozak
|
253db21073
|
Merge pull request #416 from Philoul/Statistic_percentage
Stats: inRange percentage to always get a sum equal to 100%
|
2021-03-17 09:45:37 +01:00 |
|
|
Philoul
|
919a718a81
|
Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
# core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
|
2021-03-17 08:55:26 +01:00 |
|
|
Philoul
|
fc78e5c0b7
|
Stats: inRange percentage to always get a sum equal to 100%
|
2021-03-14 17:37:58 +01:00 |
|
|
Philoul
|
4bd21c2a68
|
Add string to Activity monitor for translation
|
2021-03-14 17:07:27 +01:00 |
|
|
Philoul
|
d731762c70
|
Add optional condition in ValueWithUnit constructor and remove tests for uel.log
|
2021-03-13 12:15:21 +01:00 |
|
|
Philoul
|
f3787304f8
|
Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_DevMerge
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
# database/schemas/info.nightscout.androidaps.database.AppDatabase/4.json
|
2021-03-09 21:50:17 +01:00 |
|
|
Milos Kozak
|
c28fb465fb
|
Merge remote-tracking branch 'ns/dev' into careportal
|
2021-03-08 20:27:53 +01:00 |
|
|
Milos Kozak
|
6c072dbe6e
|
Merge pull request #402 from nightscout/adrian/cleanup-glucosestatus
Refactor GlucoseStatusProvider out of GlucoseStatus
|
2021-03-08 20:20:10 +01:00 |
|
|
Milos Kozak
|
8db8edc3f6
|
Careportal -> Room
|
2021-03-08 20:10:02 +01:00 |
|
|
Philoul
|
816fd531a2
|
Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits
|
2021-03-08 18:21:57 +01:00 |
|
|
AdrianLxM
|
3cb07c215e
|
Refactor GlucoseStatusProvider out of GlucoseStatus
|
2021-03-07 20:22:03 +01:00 |
|
|
Milos Kozak
|
bcfa449ec8
|
lints
|
2021-03-07 19:26:08 +01:00 |
|
|
Milos Kozak
|
658f565cf2
|
Notofocation -> kt
|
2021-03-07 17:46:21 +01:00 |
|
|
Milos Kozak
|
563bee2faf
|
PumpDescription -> kt
|
2021-03-07 15:19:51 +01:00 |
|
|
Milos Kozak
|
23c23ea0b8
|
TrendArrow calculation
|
2021-03-05 23:08:43 +01:00 |
|
|
Philoul
|
4ce59b929a
|
Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
|
2021-03-03 22:49:31 +01:00 |
|
|
Milos Kozak
|
17ceb42df8
|
better message for out of limit
|
2021-03-03 00:07:02 +01:00 |
|
|
Milos Kozak
|
05d5f8217c
|
fix tests
|
2021-03-01 17:22:12 +01:00 |
|
|
Milos Kozak
|
3b5b945fea
|
TemporaryTarget -> room database
|
2021-03-01 12:42:42 +01:00 |
|
|
Philoul
|
df995724a7
|
Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits_Draft
# Conflicts:
# automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
|
2021-03-01 08:34:40 +01:00 |
|
|
Philoul
|
8798be0c34
|
Update uel.log entries, Increase database version 3=>4, update migration3to4
|
2021-02-28 15:54:37 +01:00 |
|
|
Milos Kozak
|
469d11e2b3
|
SntpClient -> kt
|
2021-02-25 17:43:20 +01:00 |
|
|
Milos Kozak
|
b9d03e4d00
|
make classes static where possible
|
2021-02-24 13:50:35 +01:00 |
|
|
Milos Kozak
|
a0632f7753
|
automation module
|
2021-02-22 17:22:30 +01:00 |
|
|
Philoul
|
820566fa62
|
Switched to Enum class for UserEntryLogger
|
2021-02-21 00:28:44 +01:00 |
|
|
Philoul
|
73ebc00085
|
Fix key
|
2021-02-20 20:25:52 +01:00 |
|
|
Philoul
|
14454f6c15
|
Create keys for uel.log
|
2021-02-20 13:30:34 +01:00 |
|
|
Milos Kozak
|
aae0c03ae4
|
Merge pull request #333 from nightscout/adrian/system-carb-timer
Adrian/system carb timer
|
2021-02-19 16:21:33 +01:00 |
|
|
AdrianLxM
|
0457c1bf70
|
fix tests and switch icon and checkbox
|
2021-02-16 19:03:38 +01:00 |
|
|
Milos Kozak
|
6f3266e845
|
IobCobCalculatorPlugin -> kt
|
2021-02-16 13:48:59 +01:00 |
|
|
AdrianLxM
|
3314cbfbc2
|
Merge branch 'dev' into adrian/system-carb-timer
|
2021-02-16 00:06:09 +01:00 |
|