AdrianLxM
|
d9ceeb043e
|
expandable carbs query
|
2021-03-30 23:19:53 +02:00 |
|
Philoul
|
348c260d3d
|
QuickWizard
|
2021-03-30 23:13:20 +02:00 |
|
Philoul
|
bf218e9ff4
|
Merge remote-tracking branch 'Nightscout/meallink' into meallink_ValueWithUnit
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.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
|
2021-03-30 23:05:19 +02:00 |
|
Milos Kozak
|
299d0a9b01
|
finish Dana pumps
|
2021-03-30 22:45:45 +02:00 |
|
Philoul
|
9b0226719f
|
Remove used import
|
2021-03-30 22:25:28 +02:00 |
|
Philoul
|
78a98358d7
|
Add QuickWizard Source (final solution)
|
2021-03-30 22:20:21 +02:00 |
|
Milos Kozak
|
07d060c2b5
|
carbs with duration
|
2021-03-30 22:05:44 +02:00 |
|
Milos Kozak
|
1ae4823a9a
|
Merge remote-tracking branch 'ns/dev' into meallink
|
2021-03-30 19:39:22 +02:00 |
|
Milos Kozak
|
7ca9caba18
|
Merge pull request #445 from nightscout/adrian/wear-tests
load Action String Handler
|
2021-03-30 19:38:12 +02:00 |
|
Milos Kozak
|
903ed1134b
|
Merge pull request #448 from andyrozman/bug423_historyProblem
Bug423 history problem
|
2021-03-30 19:37:41 +02:00 |
|
Milos Kozak
|
e9f4f87894
|
Remove Tratment.class where possible
|
2021-03-30 19:37:26 +02:00 |
|
Philoul
|
07e2e0eaf4
|
Add QuickWizard Source (final solution)
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt
|
2021-03-30 12:22:49 +02:00 |
|
Philoul
|
61d84e66fe
|
Add QuickWizard Source (Solution TBC, information got through Note, so I create a "complicated String" to avoid Fake QuickWizard in UserEntry)
|
2021-03-29 23:47:21 +02:00 |
|
Philoul
|
d607b855b0
|
Add QuickWizard Source (not sure if it's the best solution...)
|
2021-03-29 23:03:53 +02:00 |
|
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
|
0a61585836
|
core.pump.common cleanup
|
2021-03-29 10:45:48 +02:00 |
|
Philoul
|
6956a17bf6
|
Move Colored Action to UserEntryPresentationHelper.kt
Treatment is now replaced by Bolus + Carbs (blue and orange)
|
2021-03-29 09:49:08 +02:00 |
|
Milos Kozak
|
f37e3ab4c2
|
Simplify IOB calculation call
|
2021-03-29 09:43:25 +02:00 |
|
Milos Kozak
|
e3ac451f8d
|
PumpSync interface, VirtualPump, remove pump driver dependency to database
|
2021-03-29 00:31:40 +02:00 |
|
Philoul
|
74b911d875
|
Remove SerializedName (all) and Text (Sources)
|
2021-03-28 21:45:40 +02:00 |
|
Andy Rozman
|
e3a75a55eb
|
Merge branch 'dev' into bug423_historyProblem
|
2021-03-28 20:45:19 +01:00 |
|
Andy Rozman
|
bd72473253
|
- checked all PumpHistoryEntryType entries and removed most of the ones that are not in go code from Eric
- fixed problem with BGReceived512
|
2021-03-28 20:42:15 +01:00 |
|
Philoul
|
9d4a1d5944
|
Remove UserEntryExt file and move UserEntryPresentationHelper.kt in utils folder
|
2021-03-28 18:52:13 +02:00 |
|
Philoul
|
09349fddd4
|
Fix Action Name and Translator
|
2021-03-28 17:54:18 +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 |
|
Philoul
|
b9ffb1ca13
|
Fix Build
|
2021-03-28 16:25:37 +02:00 |
|
Milos Kozak
|
df1e2c53db
|
Bolus, Carbs, BolusCalcResult new way of upload to NS
|
2021-03-28 13:45:27 +02:00 |
|
AdrianLxM
|
4e77902bdb
|
correct call of teardown wear plugin
|
2021-03-27 23:35:57 +01:00 |
|
AdrianLxM
|
dc79109f5e
|
load Action String Handler
|
2021-03-27 23:35:50 +01:00 |
|
Milos Kozak
|
c9c02458d6
|
TT & GV new way of upload to NS
|
2021-03-27 23:14:51 +01:00 |
|
AdrianLxM
|
57f9fa0730
|
correct call of teardown wear plugin
|
2021-03-27 22:49:22 +01:00 |
|
AdrianLxM
|
b077b1d5b1
|
load Action String Handler
|
2021-03-27 22:47:45 +01:00 |
|
AdrianLxM
|
7db2e112ee
|
UserEntryPresentationHelper
|
2021-03-27 22:33:39 +01:00 |
|
AdrianLxM
|
60f51cfab9
|
sealed class serialisation refactored
|
2021-03-27 21:43:05 +01:00 |
|
AdrianLxM
|
fa538f059c
|
sealed class serialisation
|
2021-03-27 21:14:56 +01:00 |
|
Philoul
|
8214874495
|
Add Local Profile source
|
2021-03-27 17:44:50 +01:00 |
|
Philoul
|
23c44b388b
|
Add Treatments source
|
2021-03-27 16:25:59 +01:00 |
|
Philoul
|
2bd2510bd8
|
Add Maintenance source
|
2021-03-27 16:17:38 +01:00 |
|
Philoul
|
b375ae45ae
|
Improve Layout (avoid overlap between Action and Icon on low res screen)
|
2021-03-27 16:02:40 +01:00 |
|
Philoul
|
1876a6064c
|
TimeUnit for ms-> min conversion
|
2021-03-27 14:15:35 +01:00 |
|
Philoul
|
f8a38889a3
|
Add UserEntry for Automation rules (PS, TT, Loop)
|
2021-03-27 12:05:07 +01:00 |
|
Philoul
|
2e59dd3112
|
Add UserEntry for Wear
|
2021-03-27 00:58:01 +01:00 |
|
Milos Kozak
|
6aa9a0fe12
|
bypass Queue for TemporaryTargets
|
2021-03-26 21:16:27 +01: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 |
|
Philoul
|
b329971d9a
|
Add Filter to hide Loop entries
I didn't find an easy way to filter with SQL query, so I filtered manually the list, probably not the best solution...
|
2021-03-25 23:47:03 +01:00 |
|