caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
10845 commits 1 branch 20 tags 140 MiB
Commit graph

1083 commits

Author SHA1 Message Date
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
Philoul
854715955a Add Careportal and actions sources + icons 2021-03-25 23:08:32 +01:00
Philoul
6e0d21a874 Add Source icon in UserEntryFragment, Update source in uel.log 2021-03-25 13:32:11 +01:00
Philoul
d3a9947cb4 Integrate Source for SMS, NS and Bolus Record (Simplify list of actions) 2021-03-23 15:42:55 +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
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
98c7508383 NSClientMbgWorker 2021-03-20 14:51:10 +01:00
Milos Kozak
e53c91fc58 DataWorker, NSDeviceStatus -> kt 2021-03-20 12:30:57 +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
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
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
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
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
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
177bf214fd xml export initialization 2021-03-06 16:14:44 +01:00
Milos Kozak
23c23ea0b8 TrendArrow calculation 2021-03-05 23:08:43 +01:00
Philoul
c065672179 Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev 
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
 2021-03-04 23:19:08 +01:00
Milos Kozak
04f074caf9 MainApp -> kt, the rest of DatabaseHelperInterface 2021-03-04 19:23:01 +01:00
Philoul
37777d7d82 Convert Long duration to min (TT from NS) 2021-03-04 00:22:40 +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
Philoul
efa9e18f83 Constructor for formated Strings with param, add notes, convert to AAPS units in fragment 2021-03-02 22:43:18 +01:00
Milos Kozak
efddea0eee
Merge pull request #386 from nightscout/tt 
TempTarget -> room
 2021-03-02 22:41:36 +01:00
Milos Kozak
06f35dc522 small fixes 2021-03-01 23:37:14 +01:00
Milos Kozak
ae86cfea77 log errors without tags 2021-03-01 23:11:59 +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
AdrianLxM
d098f81241 missing import 2021-02-28 20:02:36 +01:00
AdrianLxM
d42e8fbe92 call confirm wear event 2021-02-28 19:48:33 +01:00