Commit graph

264 commits

Author SHA1 Message Date
Philoul 854715955a Add Careportal and actions sources + icons 2021-03-25 23:08:32 +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 2c5725717c remove test file 2021-03-25 03:25:57 +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
Philoul e762efeaa6 Fix Migration 6 to 7 2021-03-21 19:42:32 +01:00
Philoul c3d593f7ae Start implementation of Source 2021-03-21 19:14:42 +01:00
Milos Kozak 8c59b7dc14 missing migration 2021-03-21 15:49:56 +01:00
Milos Kozak 8ec991c3d7 LoopPluginTest without powermock 2021-03-21 14:05:05 +01:00
Milos Kozak 98c7508383 NSClientMbgWorker 2021-03-20 14:51:10 +01:00
Milos Kozak a2fbab02f9 food -> Room 2021-03-19 18:49:34 +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 d731762c70 Add optional condition in ValueWithUnit constructor and remove tests for uel.log 2021-03-13 12:15:21 +01:00
Philoul c3febbcaf6 DB v5->v6 2021-03-12 00:04:05 +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 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 cc889cfa0a Remove Action.colorID, and modify Group for NS REFRESH 2021-03-07 15:11:36 +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
Philoul 5d827d123e 8 ColorGroup added for UI + Fix Carbs in WizardDialog 2021-03-06 17:42:41 +01:00
Philoul e89aaf4d11 Merge Dev, Fix new uel.log in NSClientPlugin 2021-03-03 23:53:15 +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
swissalpine 68a665bbeb
Fix for issue #380: AAPS SMB Mode: doesn't work with XDrip anymore - in latest Dev Versions
https://github.com/nightscout/AndroidAPS/issues/380
2021-03-03 11:00:48 +01:00
Philoul efa9e18f83 Constructor for formated Strings with param, add notes, convert to AAPS units in fragment 2021-03-02 22:43:18 +01:00
Philoul f226a03c83 Fix Converters.kt
Initialize a first version of Layout with Card and TreamentsUserEntryFragment
2021-03-02 13:31:07 +01:00
AdrianLxM fc7f63d219 mocking with argThat 2021-03-01 16:28:08 +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 a2c3ec3a7f Fix Constants.MGDL and Constants.MMOL
Fix .addMigrations(migration3to4) (I hope)
2021-02-28 22:05:03 +01:00
Philoul 8798be0c34 Update uel.log entries, Increase database version 3=>4, update migration3to4 2021-02-28 15:54:37 +01:00
Philoul 95e32c3406 Exemple with CalibrationDialog and CarbsDialog.kt
Good Direction ?
2021-02-27 15:45:47 +01:00
Milos Kozak a7f1758104 convert interfaces to kotlin 2021-02-25 18:42:36 +01:00
Philoul 274cac8ff9 First draft with bug 2021-02-25 12:28:36 +01:00
Philoul 666e0a34aa Fix Convertor Crash (with "existing entries in database that doesn't exist as enum new keys") 2021-02-22 14:56:29 +01:00
Philoul dec7232d42 Add Converter, companion object and unknow string 2021-02-21 22:46:43 +01:00
Philoul b4f1996717 Add extension 2021-02-21 20:49:34 +01:00
Philoul bdd5fe383c Update enum class
=> Need help for strings location
2021-02-21 12:03:15 +01:00
Philoul 820566fa62 Switched to Enum class for UserEntryLogger 2021-02-21 00:28:44 +01:00
Philoul 865bc004c0 Initialize Enum class for User Entry 2021-02-20 20:26:27 +01:00
Milos Kozak d7ad8eeefc migrate rest of gradle module files 2021-02-18 23:35:23 +01:00
Milos Kozak ff8ad7ac04 db schema 2021-02-13 22:28:11 +01:00
AdrianLxM 6203e214d2 db migration quick fix: rather lose data than crash-loop 2021-02-13 16:01:47 +01:00
Milos Kozak e374cdfa98 Merge branch 'dev' into newdb 2021-02-11 12:01:12 +01:00
AdrianLxM 5acdac3dc8 move jcenter to mavencentral, inline some dependencies, restrict jcenter to those we can be certain to update 2021-02-10 23:33:32 +01:00
Milos Kozak 7b4a30865a UserEntry logging 2021-02-09 17:57:28 +01:00
Milos Kozak 1be22d96d6 export db schema 2021-02-09 11:27:02 +01:00
Milos Kozak 4cbc30171c explicitly specify return type in AppRepository 2021-02-08 14:56:23 +01:00
Milos Kozak 145765e611 improve BG sync 2021-02-08 13:40:09 +01:00
Milos Kozak 887819edf4 eliminate BgReading::class in favor of GlucoseValue::class 2021-02-08 10:05:21 +01:00
Milos Kozak d93865997c update NS values from patched Dexcom app smoothing 2021-02-07 11:14:32 +01:00
Milos Kozak 7763a96d6a migrate BG code 2021-02-06 00:30:27 +01:00
Milos Kozak cfe23cef96 AapsSchedulers 2021-02-04 20:54:09 +01:00
Milos Kozak b04862f602 database module 2021-02-04 18:22:58 +01:00