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

10814 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 23a3b45671
Merge pull request #430 from andyrozman/fr420_rl_battery_level 
Feature request 420 - RL battery level
 2021-03-20 18:37:13 +01:00
Andy Rozman 238b466c24 - change log 2021-03-20 13:57:16 +00: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
Andy Rozman 3fde3a03a8 - Merge branch 'dev' into fr420_rl_battery_level 
- fixing problem with logging, had to wrap them in String.format for this to work
- fixed problem with uploading event to nightscout, there was exception because entry was added where glucose value was not set
 2021-03-19 23:34:53 +00:00
AdrianLxM a0c9ab7de0 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-03-19 23:37:12 +01:00
AdrianLxM 3a3e75fd92 update gradle 2021-03-19 23:36:57 +01:00
AdrianLxM 6a8a7bd467
Merge pull request #427 from nightscout/adrianbrian/extract-nsupload 
use UploadQueue through interface
 2021-03-19 23:36:28 +01:00
Philoul 68b8525935 Accept null notes (from Careportal) 2021-03-19 23:14:45 +01:00
Andy Rozman 2c6f64b71f - fixed log support, it still used {} as data placeholders, which doesn't work with aapsLogger 2021-03-19 20:50:58 +00:00
AdrianLxM 7d2e364c77 use UploadQueue through interface 2021-03-19 21:35:09 +01:00
Milos Kozak 3d4d27439a
Merge pull request #425 from nightscout/pull/393 
User entry logging
 2021-03-19 12:51:36 +01:00
Milos Kozak 05745f6867 fix test 2021-03-19 12:21:52 +01:00
Milos Kozak 8736f6db7e Merge branch 'dev' into pull/393 2021-03-19 11:42:59 +01:00
Milos Kozak ec1262727b
Merge pull request #422 from andyrozman/bug418_historyFix_BolusWizardRecordProblem 
Bug418 history fix bolus wizard record problem
 2021-03-18 23:18:14 +01:00
Philoul afa64d0111 Try to fix test, Probably a bit better but doesn't work 2021-03-18 23:01:31 +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
Andy Rozman ba8c436136 - added battery display, should be done 2021-03-18 00:08:04 +00:00
Philoul accfc24332 Optimize Actions 2021-03-17 22:45:08 +01:00
Andy Rozman 3d725daed4 - added format codes for logging 2021-03-17 16:03:51 +00:00
Andy Rozman 84bf6028de - made some changes so that I can test data locally within AAPS 
- changed some code, just so that visualization in log is little better
- if there are bytes skipped there is error message now displayed in log
 2021-03-17 14:12:28 +00:00
Andy Rozman a87613d41e - fix 418, BolusWizardSetup record was not correctly decoded which made problem in history 2021-03-17 13:18:10 +00:00
Philoul 2b6f060eae Translate TT_Reason (UserEntry and csv export) 2021-03-17 12:05:25 +01:00
Milos Kozak 09d7ab01fb
Merge pull request #421 from nightscout/MilosKozak-patch-1 
Update issue templates
 2021-03-17 10:27:57 +01:00
Milos Kozak db19ef21ec Update issue templates 2021-03-17 10:26:43 +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 9d5d79dcec Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-03-16 19:03:47 +01:00
Milos Kozak a7d76d4805 fix NPE 2021-03-16 19:03:36 +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
Milos Kozak 44d5a04db2
Merge pull request #415 from Philoul/Statistic_string_for_translation 
Add string to Activity monitor for translation
 2021-03-16 18:16:58 +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
Milos Kozak 9790f1d558
Merge pull request #409 from nightscout/dependabot/gradle/dev/org.json-json-20210307 
Bump json from 20201115 to 20210307
 2021-03-12 17:28:38 +01:00
Philoul c3febbcaf6 DB v5->v6 2021-03-12 00:04:05 +01:00
Philoul 391c5e19f7 Fix Notes visibility + Update UE on Pref change 2021-03-10 20:55:22 +01:00
dependabot[bot] f4b2bbfbdf
Bump json from 20201115 to 20210307 
Bumps [json](https://github.com/douglascrockford/JSON-java) from 20201115 to 20210307.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-10 07:21:51 +00: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