Philoul
d731762c70
Add optional condition in ValueWithUnit constructor and remove tests for uel.log
2021-03-13 12:15:21 +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
c28fb465fb
Merge remote-tracking branch 'ns/dev' into careportal
2021-03-08 20:27:53 +01:00
Milos Kozak
91e323b5f5
New Crowdin updates ( #388 )
...
* New translations exam.xml (Portuguese)
* New translations validator.xml (Slovak)
* New translations alert_descriptions.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations alert_titles.xml (Tamil)
* New translations alert_descriptions.xml (Tamil)
* New translations alert_codes.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations validator.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations exam.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations objectives.xml (Tamil)
* New translations exceptions.xml (Tamil)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations exam.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Dutch)
* New translations strings.xml (Romanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (German)
* New translations validator.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Hebrew)
* New translations objectives.xml (Hebrew)
* New translations strings.xml (Czech)
* New translations strings.xml (Italian)
* New translations strings.xml (Portuguese)
* New translations alert_titles.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations exam.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations validator.xml (French)
* New translations alert_descriptions.xml (French)
* New translations alert_titles.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (German)
* New translations strings.xml (French)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (Czech)
* New translations strings.xml (Italian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (French)
* New translations alert_descriptions.xml (Swedish)
* New translations alert_titles.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations exam.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
2021-03-08 20:22:45 +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
9345276f94
Merge pull request #398 from Tornado-Tim/fix-LGS-constraint
...
Fix Low Glucose Constraint
2021-03-07 18:20:22 +01:00
Milos Kozak
658f565cf2
Notofocation -> kt
2021-03-07 17:46:21 +01:00
Milos Kozak
20cabd00bb
more kotlin conversion
2021-03-07 15:31:05 +01:00
Milos Kozak
563bee2faf
PumpDescription -> kt
2021-03-07 15:19:51 +01:00
Philoul
cc889cfa0a
Remove Action.colorID, and modify Group for NS REFRESH
2021-03-07 15:11:36 +01:00
Milos Kozak
54ad6caf83
interfaces -> kt
2021-03-07 14:37:05 +01:00
Milos Kozak
b9e50885a8
Constraint -> kt
2021-03-07 14:22:50 +01:00
Milos Kozak
2ea423c704
PumpEnactResult -> kt
2021-03-07 13:31:11 +01:00
Milos Kozak
00ee60ff1e
Intervals -> kt
2021-03-07 11:05:33 +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
Milos Kozak
72176edfb9
core -> kt, move tests to core
2021-03-07 00:49:18 +01:00
Milos Kozak
9b78839f5d
typo
2021-03-06 23:18:57 +01:00
Philoul
cf83d20e13
Merge branch 'User_Entry_ValueWithUnits' into UE_ExportXML
...
# Conflicts:
# core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt
# database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
2021-03-06 22:31:39 +01:00
Philoul
523a9f2800
Add detailed information for Careportal entries
2021-03-06 19:45:13 +01:00
Philoul
5d827d123e
8 ColorGroup added for UI + Fix Carbs in WizardDialog
2021-03-06 17:42:41 +01:00
Philoul
177bf214fd
xml export initialization
2021-03-06 16:14:44 +01:00
Tim Gunn
6ecdd4d7fc
Add appropriate constraint so isLgsAllowed Constraint can be properly checked
2021-03-07 02:53:01 +13:00
Milos Kozak
65770ecbf6
RS pairing improvement
2021-03-05 21:19:53 +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
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
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
Philoul
f226a03c83
Fix Converters.kt
...
Initialize a first version of Layout with Card and TreamentsUserEntryFragment
2021-03-02 13:31:07 +01:00
Milos Kozak
b5dcf27b07
New Crowdin updates ( #378 )
...
* New translations validator.xml (Dutch)
* New translations validator.xml (German)
* New translations alert_descriptions.xml (German)
* New translations alert_titles.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations validator.xml (Romanian)
* New translations alert_descriptions.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations exam.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations validator.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
2021-03-01 23:55:55 +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
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
b6cb9edaa3
New Crowdin updates ( #374 )
...
* New translations strings.xml (Afrikaans)
* New translations alert_descriptions.xml (Portuguese)
* New translations alert_titles.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations validator.xml (Russian)
* New translations strings.xml (Russian)
* New translations alert_descriptions.xml (Russian)
* New translations strings.xml (Russian)
2021-02-26 09:23:39 +01:00
Milos Kozak
a7f1758104
convert interfaces to kotlin
2021-02-25 18:42:36 +01:00
