Philoul
|
e490c2df04
|
Update uel.log NSClientAddUpdateWorker
|
2021-04-06 00:43:51 +02:00 |
|
Milos Kozak
|
7b4ebbd440
|
2.8.2.1-dev-e2
|
2021-04-05 23:26:13 +02:00 |
|
Milos Kozak
|
d27b7a6139
|
Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink
|
2021-04-05 23:13:17 +02:00 |
|
Milos Kozak
|
2463f8fc47
|
ExtendedBolus, TemporaryBasal -> room, DanaRS working
|
2021-04-05 22:41:28 +02:00 |
|
Philoul
|
f74cd6796f
|
Same Color for DEV and BGI in menu + SEN value * 100
|
2021-04-05 10:44:52 +02:00 |
|
Philoul
|
1e4983e659
|
Merge branch 'meallink' into meallink_ValueWithUnit
|
2021-04-04 19:55:36 +02:00 |
|
Milos Kozak
|
0782878725
|
Merge pull request #458 from nightscout/meallink-carb-callback
callback if carbs are added to db but not pump
|
2021-04-04 16:18:27 +02:00 |
|
Philoul
|
cc3919e9fc
|
Add SITE/RESERVOIR CHANGE Action and improve Colors
|
2021-04-04 15:05:43 +02:00 |
|
Philoul
|
22c1233201
|
Merge remote-tracking branch 'Nightscout/meallink' into Test_MealLink_VWU_Merge
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
|
2021-04-04 13:51:53 +02:00 |
|
Philoul
|
3cc7a72b3d
|
Fix XXXValueWithUnit Refactoring
|
2021-04-04 09:20:02 +02:00 |
|
AdrianLxM
|
94a0283eb6
|
callback if carbs are added to db but not pump
|
2021-04-03 22:51:34 +02:00 |
|
AdrianLxM
|
d62456f2e2
|
Merge branch 'meallink_ValueWithUnit' of https://github.com/Philoul/AndroidAPS into meallink_ValueWithUnit
|
2021-04-03 21:34:41 +02:00 |
|
AdrianLxM
|
c2b3e617df
|
pair programming session
|
2021-04-03 21:29:26 +02:00 |
|
Philoul
|
ae9503dcc0
|
Add StringResource to uel.log Food
|
2021-04-03 19:04:08 +02:00 |
|
Philoul
|
be35597da4
|
Add Pump Sources (only Dana currently has an Entry, but required I think for pump history uploaded in AAPS, or Prime/Fill/ReservoirChange from pump)
|
2021-04-03 18:51:36 +02:00 |
|
Philoul
|
206bac6da8
|
Safe Delete old ValueWithUnit Class in UserEntry
|
2021-04-03 12:51:49 +02:00 |
|
Philoul
|
dc87bfa303
|
Replace all remaining ValueWithUnit by XXXValueWithUnit and remove Deprecated uel.log functions
|
2021-04-03 12:25:44 +02:00 |
|
Philoul
|
442e64e3f0
|
Add dao for Fragment
|
2021-04-02 18:59:41 +02:00 |
|
Milos Kozak
|
e26e023ebf
|
prepare TemporaryBasal
|
2021-04-01 23:46:21 +02:00 |
|
Philoul
|
bb147deb92
|
CalibrationDialog + CarbDialog
|
2021-04-01 23:22:22 +02:00 |
|
Philoul
|
16959d4de9
|
Merge branch 'meallink' into meallink_ValueWithUnit
|
2021-04-01 23:02:52 +02:00 |
|
Philoul
|
9b9bafb4bc
|
CarePortal, ExtendedBolusDialog, FillDialog, InsulinDialog
Some cleaning in Imports
|
2021-04-01 22:59:05 +02:00 |
|
Philoul
|
1a1d718fa2
|
TreatmentDialog (fix missing uel.log if only carbs), BolusWizard, and TempTargetDialog
|
2021-04-01 22:23:53 +02:00 |
|
Philoul
|
83f4d25527
|
UserEntry refactor to include XXXValueWithUnit (Loop Dialog and ProfileSwitchDialog only)
|
2021-04-01 19:27:13 +02:00 |
|
Philoul
|
a07b685e8d
|
UserEntry refactor to include XXXValueWithUnit (first test)
|
2021-04-01 18:26:13 +02:00 |
|
Milos Kozak
|
46793abbfc
|
Treatment cleanup
|
2021-04-01 18:14:31 +02:00 |
|
Philoul
|
e13e5e10eb
|
Merge branch 'meallink' into meallink_ValueWithUnit
|
2021-04-01 08:13:48 +02:00 |
|
Milos Kozak
|
699413dd6f
|
fix tests
|
2021-04-01 00:37:15 +02:00 |
|
Milos Kozak
|
ab0f64bd46
|
Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink
|
2021-04-01 00:03:54 +02:00 |
|
Milos Kozak
|
2df8c4fc74
|
provide Worker failure results
|
2021-04-01 00:03:49 +02:00 |
|
Milos Kozak
|
28f366d5fe
|
Merge pull request #453 from jotomo/meallink+revert-lint-suggestion
Revert incorrect Lint suggestion.
|
2021-04-01 00:01:14 +02:00 |
|
Milos Kozak
|
cacf239d17
|
VirtualPump plugin remove init
|
2021-03-31 22:59:05 +02:00 |
|
Philoul
|
3d9ef71045
|
Merge branch 'meallink' into meallink_ValueWithUnit
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
|
2021-03-31 22:18:50 +02:00 |
|
Milos Kozak
|
a5ea0d9027
|
DeviceStatus
|
2021-03-31 21:54:49 +02:00 |
|
Johannes Mockenhaupt
|
edcdc4c785
|
Revert incorrect Lint suggestion.
|
2021-03-31 20:44:35 +02:00 |
|
Philoul
|
ab0c739281
|
Clean Imports and add missing Sources in existing uel
|
2021-03-31 00:18:55 +02:00 |
|
Philoul
|
21f382f0ae
|
Remove unused code
|
2021-03-30 23:29:43 +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
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
Philoul
|
854715955a
|
Add Careportal and actions sources + icons
|
2021-03-25 23:08:32 +01:00 |
|
Philoul
|
0e835cfb23
|
Fix Missing eventTime for Prime/Fill Dialog
|
2021-03-25 18:40:20 +01:00 |
|
Philoul
|
a23545bbc1
|
Avoid SMB with 0.00 value
|
2021-03-25 17:53:54 +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 |
|
Philoul
|
d3a9947cb4
|
Integrate Source for SMS, NS and Bolus Record (Simplify list of actions)
|
2021-03-23 15:42:55 +01:00 |
|
Philoul
|
ac3baab3f3
|
Merge remote-tracking branch 'Nightscout/dev' into UserEntryImprovement
|
2021-03-23 15:42:03 +01:00 |
|
Milos Kozak
|
616871c95c
|
prepare DetailedBolusInfo
|
2021-03-22 16:59:09 +01:00 |
|
Milos Kozak
|
3d08683e57
|
Merge pull request #428 from nightscout/adrian/automation-rework
automation elements without injector
|
2021-03-21 19:40:18 +01:00 |
|
Philoul
|
c3d593f7ae
|
Start implementation of Source
|
2021-03-21 19:14:42 +01:00 |
|
Milos Kozak
|
8ec991c3d7
|
LoopPluginTest without powermock
|
2021-03-21 14:05:05 +01:00 |
|
Milos Kozak
|
ed30e2bf10
|
fix NPE
|
2021-03-21 13:52:15 +01:00 |
|
Milos Kozak
|
87ab4fda0e
|
NSSgv -> kt
|
2021-03-21 13:50:06 +01:00 |
|
Milos Kozak
|
69f8195bbe
|
2.8.2.1-dev-e
|
2021-03-20 23:17:05 +01:00 |
|
Milos Kozak
|
70c08d0fe8
|
Merge remote-tracking branch 'ns/dev' into food
|
2021-03-20 20:40:51 +01:00 |
|
Milos Kozak
|
415729f243
|
bypass Intents on NS received data
|
2021-03-20 20:31:44 +01:00 |
|
Milos Kozak
|
7f95144564
|
Merge pull request #429 from Philoul/FixCarePortalNoteNull
Allow null notes in UserEntryLogger
|
2021-03-20 18:38:00 +01:00 |
|
Milos Kozak
|
98c7508383
|
NSClientMbgWorker
|
2021-03-20 14:51:10 +01:00 |
|
Milos Kozak
|
e53c91fc58
|
DataWorker, NSDeviceStatus -> kt
|
2021-03-20 12:30:57 +01:00 |
|
Philoul
|
fdbd7f63e5
|
Null notes managed in uel.log
|
2021-03-20 09:36:06 +01:00 |
|
Philoul
|
59abe42032
|
Timestamp before type for consistency of presentation in TreatmentsUserEntryFragment (Careportal Removed)
|
2021-03-20 09:27:46 +01:00 |
|
AdrianLxM
|
fd2c072799
|
automation elements without injector
|
2021-03-20 01:27:04 +01:00 |
|
Milos Kozak
|
8be3ccc989
|
return proper result from Worker
|
2021-03-19 22:41:19 +01:00 |
|
AdrianLxM
|
7d2e364c77
|
use UploadQueue through interface
|
2021-03-19 21:35:09 +01:00 |
|
Milos Kozak
|
a2fbab02f9
|
food -> Room
|
2021-03-19 18:49:34 +01:00 |
|
Milos Kozak
|
8736f6db7e
|
Merge branch 'dev' into pull/393
|
2021-03-19 11:42:59 +01:00 |
|
Philoul
|
400f55f3d9
|
Remove TT_Reason unit (now the same than TherapyEvent Unit that include all enum key translated with Translator)
Fix TT Custom missing
|
2021-03-18 11:15:45 +01:00 |
|
Philoul
|
accfc24332
|
Optimize Actions
|
2021-03-17 22:45:08 +01:00 |
|
Philoul
|
2b6f060eae
|
Translate TT_Reason (UserEntry and csv export)
|
2021-03-17 12:05:25 +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 |
|
Milos Kozak
|
02afb58a14
|
fix of fix
|
2021-03-16 21:18:44 +01:00 |
|
Milos Kozak
|
91fecb6cc7
|
fix NPE
|
2021-03-16 19:06:05 +01:00 |
|
Milos Kozak
|
e2e060b9a9
|
Merge pull request #414 from Philoul/UpdateTranslator
Fix TT Reason in TTDialog and add TT Reason to Translator
|
2021-03-16 18:17:41 +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
|
c08af324e2
|
Refactor UserEntry.Units and UserEntry.Actions translations (now included in Translator.kt)
=> Just missing TT_Reason included in #414
|
2021-03-13 22:46:14 +01:00 |
|
Philoul
|
fcb3bfc6eb
|
Fix Missing Profile Name
|
2021-03-13 22:35:37 +01:00 |
|
Philoul
|
605ca7def4
|
Fix TT Reason in TTDialog and add Reason to translator
|
2021-03-13 17:31:58 +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
|
391c5e19f7
|
Fix Notes visibility + Update UE on Pref change
|
2021-03-10 20:55:22 +01:00 |
|
Philoul
|
dc010adf8c
|
Improve UserEntryitem Layout
|
2021-03-09 23:02:31 +01:00 |
|
Philoul
|
441f419bfa
|
Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_DevMerge
|
2021-03-09 22:44:33 +01:00 |
|
Philoul
|
9e2ce1cc27
|
Fix uel after last merge (Mainly Careportal entries form NS)
|
2021-03-09 22:41:57 +01:00 |
|
Milos Kozak
|
8ec346cd35
|
specify glucoseUnit, DB++
|
2021-03-09 22:11:30 +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 |
|
Philoul
|
01a1321cbb
|
Clean and simplify code
Add comment in UserEntry (data type for each Unit)
|
2021-03-09 21:09:59 +01:00 |
|
Philoul
|
f3d6fff565
|
Add Export CSV in Maintenance Fragment
|
2021-03-08 21:42:16 +01:00 |
|
Milos Kozak
|
c28fb465fb
|
Merge remote-tracking branch 'ns/dev' into careportal
|
2021-03-08 20:27:53 +01:00 |
|
Milos Kozak
|
91e323b5f5
|
New Crowdin updates (#388)
* New translations exam.xml (Portuguese)
* New translations validator.xml (Slovak)
* New translations alert_descriptions.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations alert_titles.xml (Tamil)
* New translations alert_descriptions.xml (Tamil)
* New translations alert_codes.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations validator.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations exam.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations objectives.xml (Tamil)
* New translations exceptions.xml (Tamil)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations exam.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Dutch)
* New translations strings.xml (Romanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (German)
* New translations validator.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Hebrew)
* New translations objectives.xml (Hebrew)
* New translations strings.xml (Czech)
* New translations strings.xml (Italian)
* New translations strings.xml (Portuguese)
* New translations alert_titles.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations exam.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations validator.xml (French)
* New translations alert_descriptions.xml (French)
* New translations alert_titles.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (German)
* New translations strings.xml (French)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (Czech)
* New translations strings.xml (Italian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (French)
* New translations alert_descriptions.xml (Swedish)
* New translations alert_titles.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations exam.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
|
2021-03-08 20:22:45 +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
|
f7f6f4b7c1
|
Merge branch 'User_Entry_ValueWithUnits' into UE_ExportXML
|
2021-03-08 18:22:50 +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 |
|
Philoul
|
c931c8d25a
|
Careportal Remove Duration ValueWithUnit if empty
|
2021-03-07 15:07:35 +01:00 |
|
Milos Kozak
|
54ad6caf83
|
interfaces -> kt
|
2021-03-07 14:37:05 +01:00 |
|
Milos Kozak
|
fcb4d00ba2
|
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
|
2021-03-07 14:22:53 +01:00 |
|
Milos Kozak
|
b9e50885a8
|
Constraint -> kt
|
2021-03-07 14:22:50 +01:00 |
|
Milos Kozak
|
2ea423c704
|
PumpEnactResult -> kt
|
2021-03-07 13:31:11 +01:00 |
|
Philoul
|
46cc4d9e85
|
Careportal Remove Duration ValueWithUnit if empty
|
2021-03-07 10:52:42 +01:00 |
|
Philoul
|
c259aa345c
|
Csv format (not xml) modified to Excel default
remove unnecessary " and use ; as separator
|
2021-03-07 10:43:33 +01:00 |
|
Philoul
|
6096825f4c
|
Formatage xml 1ère version
|
2021-03-07 03:09:30 +01:00 |
|
Milos Kozak
|
021d70bbe6
|
Merge pull request #399 from Philoul/Fix_Carbs_Layout
Fix Carbs Layout
|
2021-03-07 00:58:23 +01:00 |
|
Milos Kozak
|
72176edfb9
|
core -> kt, move tests to core
|
2021-03-07 00:49:18 +01:00 |
|
Philoul
|
cf83d20e13
|
Merge branch 'User_Entry_ValueWithUnits' into UE_ExportXML
# Conflicts:
# core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt
# database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
|
2021-03-06 22:31:39 +01:00 |
|
Philoul
|
523a9f2800
|
Add detailed information for Careportal entries
|
2021-03-06 19:45:13 +01:00 |
|
Philoul
|
5d827d123e
|
8 ColorGroup added for UI + Fix Carbs in WizardDialog
|
2021-03-06 17:42:41 +01:00 |
|