Commit graph

112 commits

Author SHA1 Message Date
Andy Rozman 029eb55f0e - changes according to comment in PR
- moved files from core to pump-common (which we could without major changes)
- removed DbObjectBase, and removed its deps in files (3)
- changed id for rileylink project (was the same as for pump-common)
2021-05-26 13:14:17 +01:00
Philoul 98aac56c1c UserEntryPresentationHelper / csv improvement 2021-05-13 15:10:53 +02:00
Philoul 4cadec78e5 Improvement Action String (TT) 2021-05-13 14:38:04 +02:00
Milos Kozak 0f2f5cd1fa Profile sync, removed NSProfile 2021-05-04 21:07:47 +02:00
Philoul 0b928c3140 Add uel.log for Cancel Bolus Button 2021-04-20 20:00:07 +02:00
Milos Kozak b0a12dab1a
Merge pull request #468 from Philoul/meallink_VWU_v2
Fix double Entries in Treatment Dialog (+ add new uel.log for plugin enabled/disabled
2021-04-11 08:39:43 +02:00
Philoul baa37c4e3a uel.log for plugin enabled / disabled 2021-04-10 19:55:24 +02:00
Milos Kozak ebf0781f47
Merge pull request #466 from Philoul/meallink_VWU_v2
New uel.log
2021-04-10 18:23:40 +02:00
Philoul c728f8689b uel.log for Start and Exit AAPS 2021-04-10 11:35:38 +02:00
Milos Kozak 194cf305fd Rv2,RKorean 2021-04-10 10:41:53 +02:00
Philoul e490c2df04 Update uel.log NSClientAddUpdateWorker 2021-04-06 00:43:51 +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 cc3919e9fc Add SITE/RESERVOIR CHANGE Action and improve Colors 2021-04-04 15:05:43 +02:00
AdrianLxM c2b3e617df pair programming session 2021-04-03 21:29:26 +02:00
Philoul 2a03d1d7ca Remove presentation of StringResource with Param to avoid crash
Move String used in uel.log to core
2021-04-03 15:39:43 +02:00
Philoul 21f382f0ae Remove unused code 2021-03-30 23:29:43 +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 87fecfd255 Fix Build 2 2021-03-28 17:37:32 +02: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
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 db4268f408 UserEntry text format and colors.xml
ValueWithUnit Bold
Note standard grey color
Action Colored (table in UserEntryExt.kt)
2021-03-04 14:52:30 +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