Commit graph

76 commits

Author SHA1 Message Date
Philoul
f24be5beff CSV format improved
Previously one line per ValueWithUnit (one columns for value and one column for units) and one Action could be recorded in several lines according to number of ValueWithUnits
Now one line for one Action, and we have one column for each unit
2021-03-21 14:03:15 +01:00
Philoul
accfc24332 Optimize Actions 2021-03-17 22:45:08 +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
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
4bd21c2a68 Add string to Activity monitor for translation 2021-03-14 17:07:27 +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
9e2ce1cc27 Fix uel after last merge (Mainly Careportal entries form NS) 2021-03-09 22:41:57 +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
816fd531a2 Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits 2021-03-08 18:21:57 +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
177bf214fd xml export initialization 2021-03-06 16:14:44 +01:00
Milos Kozak
65770ecbf6 RS pairing improvement 2021-03-05 21:19:53 +01:00
Philoul
e89aaf4d11 Merge Dev, Fix new uel.log in NSClientPlugin 2021-03-03 23:53:15 +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
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
8798be0c34 Update uel.log entries, Increase database version 3=>4, update migration3to4 2021-02-28 15:54:37 +01:00
Philoul
274cac8ff9 First draft with bug 2021-02-25 12:28:36 +01:00
Milos Kozak
bf952cca33 Merge branch 'preference_warning_fix' of https://github.com/osodebailar/AndroidAPS-Nightscout_Fork into osodebailar-preference_warning_fix 2021-02-24 17:19:52 +01:00
Milos Kozak
07bf16b07b rename core strings 2021-02-22 18:04:30 +01:00
Milos Kozak
a0632f7753 automation module 2021-02-22 17:22:30 +01:00
Philoul
dec7232d42 Add Converter, companion object and unknow string 2021-02-21 22:46:43 +01:00
Milos Kozak
0322dd48ac insight -> lib 2021-02-21 18:03:26 +01:00
Milos Kozak
32873e0730 combo -> new lib 2021-02-21 14:34:31 +01:00
Philoul
bdd5fe383c Update enum class
=> Need help for strings location
2021-02-21 12:03:15 +01:00
Philoul
db23a5e9f7 Update Strings (translatable and key removed) 2021-02-21 10:35:04 +01:00
Philoul
14454f6c15 Create keys for uel.log 2021-02-20 13:30:34 +01:00
osodebailar
a2b0ae47f9 remove preference warning 2021-02-16 20:04:38 +01:00
Milos Kozak
1b132fd589 cleanup 2021-02-14 11:38:28 +01:00
AdrianLxM
c7e261d0e6 weekday picker working without view 2021-02-13 18:30:35 +01:00
Milos Kozak
ee6cd22d24 MedtronicFragment -> jetpack 2021-02-03 23:02:14 +01:00
Milos Kozak
6fbdda5716 force reset fabric upload 2021-01-27 15:40:13 +01:00
Milos Kozak
e26ae1af7d asking for permissions refactor 2021-01-18 22:47:55 +01:00
Milos Kozak
65a39d91be refactor import/export to create DaggerAppCompatActivityWithResult 2021-01-18 17:36:18 +01:00
Milos Kozak
c8f7dae2c8 Bolus advisor 2020-12-28 16:42:00 +01:00
Milos Kozak
6cb62412c5 ErrorDialog improvemnts 2020-12-14 14:20:02 +01:00
Milos Kozak
30624053e3 transfer overview configuration to NSClient 2020-12-04 17:55:35 +01:00
Milos Kozak
3f77496c88 automated copy of configuration AAPS -> NSCLIENT 2020-11-27 16:46:33 +01:00
Milos Kozak
e223cd5de3 fix string 2020-11-08 18:11:08 +01:00
Milos Kozak
6c19edbf1c Improve NSClient preferences in NSC mode 2020-10-26 10:37:55 +01:00
Bart Sopers
adaba8b4ea Remove duplicate string resource after merge 2020-09-01 21:58:35 +02:00
Bart Sopers
b0d0ea3476 Merge remote-tracking branch 'upstream/2.7.0-rc5' into omnipod_eros_dev_upstream_merge 2020-09-01 21:57:40 +02:00
Bart Sopers
e5b6cf7231 Add option to gradually increase alarm volume 2020-08-29 05:37:26 +02:00
Bart Sopers
01c4d34df8 Display last connection in Omnipod tab in either red or white based on local alerts settings 2020-08-29 01:44:31 +02:00
Milos Kozak
cc8b22aa31
Merge pull request #2919 from Philoul/AddCalibrationInTreatmentTab
Add Manual BG or Calibration in CarePortal Tab of Treatment
2020-08-24 21:45:56 +02:00