From d6a22be18438a8984e48e5b79138ce0da695cf28 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sun, 29 Jan 2017 20:19:02 +0100 Subject: [PATCH] remove absorption rate from everywhere --- .../CircadianPercentageProfileFragment.java | 5 -- .../CircadianPercentageProfilePlugin.java | 13 +--- .../androidaps/plugins/DanaR/DanaRPump.java | 3 - .../plugins/DanaRKorean/DanaRKoreanPump.java | 3 - .../LocalProfile/LocalProfileFragment.java | 5 -- .../LocalProfile/LocalProfilePlugin.java | 10 ---- .../plugins/OpenAPSAMA/OpenAPSAMAPlugin.java | 1 - .../OpenAPSMA/DetermineBasalAdapterMAJS.java | 2 - .../plugins/OpenAPSMA/OpenAPSMAPlugin.java | 1 - .../SimpleProfile/SimpleProfileFragment.java | 5 -- .../SimpleProfile/SimpleProfilePlugin.java | 10 ---- .../nightscout/client/data/NSProfile.java | 4 +- .../circadianpercentageprofile_fragment.xml | 18 ------ .../main/res/layout/localprofile_fragment.xml | 59 +++++++------------ .../res/layout/simpleprofile_fragment.xml | 20 ++----- app/src/main/res/values-bg/strings.xml | 2 - app/src/main/res/values-cs/strings.xml | 4 +- app/src/main/res/values-de/strings.xml | 2 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 2 - app/src/main/res/values/strings.xml | 4 +- app/src/main/res/xml/pref_danarprofile.xml | 5 -- 22 files changed, 31 insertions(+), 148 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java index c68c873401..ca07d190a8 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java @@ -48,7 +48,6 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag EditText diaView; RadioButton mgdlView; RadioButton mmolView; - EditText carView; EditText targetlowView; EditText targethighView; EditText percentageView; @@ -74,7 +73,6 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag diaView = (EditText) layout.findViewById(R.id.circadianpercentageprofile_dia); mgdlView = (RadioButton) layout.findViewById(R.id.circadianpercentageprofile_mgdl); mmolView = (RadioButton) layout.findViewById(R.id.circadianpercentageprofile_mmol); - carView = (EditText) layout.findViewById(R.id.circadianpercentageprofile_car); targetlowView = (EditText) layout.findViewById(R.id.circadianpercentageprofile_targetlow); targethighView = (EditText) layout.findViewById(R.id.circadianpercentageprofile_targethigh); percentageView = (EditText) layout.findViewById(R.id.circadianpercentageprofile_percentage); @@ -101,7 +99,6 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag mgdlView.setChecked(circadianPercentageProfilePlugin.mgdl); mmolView.setChecked(circadianPercentageProfilePlugin.mmol); diaView.setText(circadianPercentageProfilePlugin.dia.toString()); - carView.setText(circadianPercentageProfilePlugin.car.toString()); targetlowView.setText(circadianPercentageProfilePlugin.targetLow.toString()); targethighView.setText(circadianPercentageProfilePlugin.targetHigh.toString()); percentageView.setText("" + circadianPercentageProfilePlugin.percentage); @@ -226,7 +223,6 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag circadianPercentageProfilePlugin.percentage = SafeParse.stringToInt(percentageView.getText().toString()); } circadianPercentageProfilePlugin.dia = SafeParse.stringToDouble(diaView.getText().toString()); - circadianPercentageProfilePlugin.car = SafeParse.stringToDouble(carView.getText().toString()); circadianPercentageProfilePlugin.targetLow = SafeParse.stringToDouble(targetlowView.getText().toString()); circadianPercentageProfilePlugin.targetHigh = SafeParse.stringToDouble(targethighView.getText().toString()); circadianPercentageProfilePlugin.timeshift = SafeParse.stringToInt(timeshiftView.getText().toString()); @@ -236,7 +232,6 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag }; diaView.addTextChangedListener(textWatch); - carView.addTextChangedListener(textWatch); targetlowView.addTextChangedListener(textWatch); targethighView.addTextChangedListener(textWatch); percentageView.addTextChangedListener(textWatch); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfilePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfilePlugin.java index 3dd2a28175..56aa813c29 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfilePlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfilePlugin.java @@ -36,7 +36,6 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte boolean mgdl; boolean mmol; Double dia; - Double car; Double targetLow; Double targetHigh; public int percentage; @@ -108,7 +107,6 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte editor.putBoolean(SETTINGS_PREFIX + "mmol", mmol); editor.putBoolean(SETTINGS_PREFIX + "mgdl", mgdl); editor.putString(SETTINGS_PREFIX + "dia", dia.toString()); - editor.putString(SETTINGS_PREFIX + "car", car.toString()); editor.putString(SETTINGS_PREFIX + "targetlow", targetLow.toString()); editor.putString(SETTINGS_PREFIX + "targethigh", targetHigh.toString()); editor.putString(SETTINGS_PREFIX + "timeshift", timeshift + ""); @@ -150,13 +148,6 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte log.debug(e.getMessage()); } else dia = 3d; - if (settings.contains(SETTINGS_PREFIX + "car")) - try { - car = SafeParse.stringToDouble(settings.getString(SETTINGS_PREFIX + "car", "20")); - } catch (Exception e) { - log.debug(e.getMessage()); - } - else car = 20d; if (settings.contains(SETTINGS_PREFIX + "targetlow")) try { targetLow = SafeParse.stringToDouble(settings.getString(SETTINGS_PREFIX + "targetlow", "80")); @@ -236,9 +227,7 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte } profile.put("carbratio", icArray); - profile.put("carbs_hr", car); - - JSONArray isfArray = new JSONArray(); + JSONArray isfArray = new JSONArray(); for (int i = 0; i < 24; i++) { isfArray.put(new JSONObject().put("timeAsSeconds", i * 60 * 60).put("value", baseisf[(offset + i) % 24] * 100d / percentage)); } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRPump.java b/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRPump.java index 50a29eb050..1e9808becd 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRPump.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRPump.java @@ -124,7 +124,6 @@ public class DanaRPump { SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext()); double dia = SafeParse.stringToDouble(SP.getString("danarprofile_dia", "3")); - double car = SafeParse.stringToDouble(SP.getString("danarprofile_car", "20")); try { json.put("defaultProfile", PROFILE_PREFIX + (activeProfile + 1)); @@ -139,8 +138,6 @@ public class DanaRPump { carbratios.put(new JSONObject().put("time", "22:00").put("timeAsSeconds", 22 * 3600).put("value", nightCIR)); profile.put("carbratio", carbratios); - profile.put("carbs_hr", car); - JSONArray sens = new JSONArray(); sens.put(new JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", nightCF)); sens.put(new JSONObject().put("time", "06:00").put("timeAsSeconds", 6 * 3600).put("value", morningCF)); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/DanaRKoreanPump.java b/app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/DanaRKoreanPump.java index d09700a2f2..b29d9a4347 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/DanaRKoreanPump.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/DanaRKoreanPump.java @@ -117,7 +117,6 @@ public class DanaRKoreanPump { SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext()); double dia = SafeParse.stringToDouble(SP.getString("danarprofile_dia", "3")); - double car = SafeParse.stringToDouble(SP.getString("danarprofile_car", "20")); try { json.put("defaultProfile", PROFILE_PREFIX + (activeProfile + 1)); @@ -132,8 +131,6 @@ public class DanaRKoreanPump { carbratios.put(new JSONObject().put("time", "22:00").put("timeAsSeconds", 22 * 3600).put("value", nightCIR)); profile.put("carbratio", carbratios); - profile.put("carbs_hr", car); - JSONArray sens = new JSONArray(); sens.put(new JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", nightCF)); sens.put(new JSONObject().put("time", "06:00").put("timeAsSeconds", 6 * 3600).put("value", morningCF)); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/LocalProfile/LocalProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/LocalProfile/LocalProfileFragment.java index 2efcecc936..6000cfddaa 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/LocalProfile/LocalProfileFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/LocalProfile/LocalProfileFragment.java @@ -45,7 +45,6 @@ public class LocalProfileFragment extends Fragment implements FragmentBase { RadioButton mmolView; TimeListEdit icView; TimeListEdit isfView; - EditText carView; TimeListEdit basalView; TimeListEdit targetView; Button profileswitchButton; @@ -66,7 +65,6 @@ public class LocalProfileFragment extends Fragment implements FragmentBase { mmolView = (RadioButton) layout.findViewById(R.id.localprofile_mmol); icView = new TimeListEdit(getContext(), layout, R.id.localprofile_ic, MainApp.sResources.getString(R.string.nsprofileview_ic_label), getPlugin().ic, null, new DecimalFormat("0.0"), save); isfView = new TimeListEdit(getContext(), layout, R.id.localprofile_isf, MainApp.sResources.getString(R.string.nsprofileview_isf_label), getPlugin().isf, null, new DecimalFormat("0.0"), save); - carView = (EditText) layout.findViewById(R.id.localprofile_car); basalView = new TimeListEdit(getContext(), layout, R.id.localprofile_basal, MainApp.sResources.getString(R.string.nsprofileview_basal_label), getPlugin().basal, null, new DecimalFormat("0.00"), save); targetView = new TimeListEdit(getContext(), layout, R.id.localprofile_target, MainApp.sResources.getString(R.string.nsprofileview_target_label), getPlugin().targetLow, getPlugin().targetHigh, new DecimalFormat("0.0"), save); profileswitchButton = (Button) layout.findViewById(R.id.localprofile_profileswitch); @@ -81,7 +79,6 @@ public class LocalProfileFragment extends Fragment implements FragmentBase { mgdlView.setChecked(localProfilePlugin.mgdl); mmolView.setChecked(localProfilePlugin.mmol); diaView.setText(localProfilePlugin.dia.toString()); - carView.setText(localProfilePlugin.car.toString()); mgdlView.setOnClickListener(new View.OnClickListener() { @Override @@ -128,13 +125,11 @@ public class LocalProfileFragment extends Fragment implements FragmentBase { public void onTextChanged(CharSequence s, int start, int before, int count) { localProfilePlugin.dia = SafeParse.stringToDouble(diaView.getText().toString()); - localProfilePlugin.car = SafeParse.stringToDouble(carView.getText().toString()); localProfilePlugin.storeSettings(); } }; diaView.addTextChangedListener(textWatch); - carView.addTextChangedListener(textWatch); onStatusEvent(null); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/LocalProfile/LocalProfilePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/LocalProfile/LocalProfilePlugin.java index 6de0ea248c..91c994cdbb 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/LocalProfile/LocalProfilePlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/LocalProfile/LocalProfilePlugin.java @@ -37,7 +37,6 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface { Double dia; JSONArray ic; JSONArray isf; - Double car; JSONArray basal; JSONArray targetLow; JSONArray targetHigh; @@ -107,7 +106,6 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface { editor.putString("LocalProfile" + "dia", dia.toString()); editor.putString("LocalProfile" + "ic", ic.toString()); editor.putString("LocalProfile" + "isf", isf.toString()); - editor.putString("LocalProfile" + "car", car.toString()); editor.putString("LocalProfile" + "basal", basal.toString()); editor.putString("LocalProfile" + "targetlow", targetLow.toString()); editor.putString("LocalProfile" + "targethigh", targetHigh.toString()); @@ -178,13 +176,6 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface { e.printStackTrace(); } } - if (settings.contains("LocalProfile" + "car")) - try { - car = SafeParse.stringToDouble(settings.getString("LocalProfile" + "car", "20")); - } catch (Exception e) { - log.debug(e.getMessage()); - } - else car = 20d; if (settings.contains("LocalProfile" + "basal")) try { basal = new JSONArray(settings.getString("LocalProfile" + "basal", DEFAULTARRAY)); @@ -290,7 +281,6 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface { json.put("store", store); profile.put("dia", dia); profile.put("carbratio", ic); - profile.put("carbs_hr", car); profile.put("sens", isf); profile.put("basal", basal); profile.put("target_low", targetLow); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java index 0ba7fb18ee..d204bed78f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java @@ -204,7 +204,6 @@ public class OpenAPSAMAPlugin implements PluginBase, APSInterface { maxIob = verifyHardLimits(maxIob, "maxIob", 0, 7); maxBasal = verifyHardLimits(maxBasal, "max_basal", 0.1, 10); - if (!checkOnlyHardLimits(profile.getCarbAbsorbtionRate(), "carbs_hr", 4, 100)) return; if (!checkOnlyHardLimits(profile.getDia(), "dia", 2, 7)) return; if (!checkOnlyHardLimits(profile.getIc(profile.secondsFromMidnight()), "carbratio", 2, 100)) return; if (!checkOnlyHardLimits(NSProfile.toMgdl(profile.getIsf(NSProfile.secondsFromMidnight()).doubleValue(), units), "sens", 2, 900)) return; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java index dfa32a2ba9..75c68cd5cc 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java @@ -63,7 +63,6 @@ public class DetermineBasalAdapterMAJS { // Profile mProfile = new V8Object(mV8rt); mProfile.add("max_iob", 0); - mProfile.add("carbs_hr", 0); mProfile.add("dia", 0); mProfile.add("type", "current"); mProfile.add("max_daily_basal", 0); @@ -230,7 +229,6 @@ public class DetermineBasalAdapterMAJS { String units = profile.getUnits(); mProfile.add("max_iob", maxIob); - mProfile.add("carbs_hr", profile.getCarbAbsorbtionRate()); mProfile.add("dia", profile.getDia()); mProfile.add("type", "current"); mProfile.add("max_daily_basal", profile.getMaxDailyBasal()); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java index 2236b7d2c2..6c17c47cb0 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java @@ -209,7 +209,6 @@ public class OpenAPSMAPlugin implements PluginBase, APSInterface { maxIob = verifyHardLimits(maxIob, "maxIob", 0, 7); maxBasal = verifyHardLimits(maxBasal, "max_basal", 0.1, 10); - if (!checkOnlyHardLimits(profile.getCarbAbsorbtionRate(), "carbs_hr", 4, 100)) return; if (!checkOnlyHardLimits(profile.getDia(), "dia", 2, 7)) return; if (!checkOnlyHardLimits(profile.getIc(profile.secondsFromMidnight()), "carbratio", 2, 100)) return; if (!checkOnlyHardLimits(NSProfile.toMgdl(profile.getIsf(NSProfile.secondsFromMidnight()).doubleValue(), units), "sens", 2, 900)) return; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SimpleProfile/SimpleProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/SimpleProfile/SimpleProfileFragment.java index c0e8926ebd..3c5ed08377 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/SimpleProfile/SimpleProfileFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/SimpleProfile/SimpleProfileFragment.java @@ -48,7 +48,6 @@ public class SimpleProfileFragment extends Fragment implements FragmentBase { RadioButton mmolView; EditText icView; EditText isfView; - EditText carView; EditText basalView; EditText targetlowView; EditText targethighView; @@ -63,7 +62,6 @@ public class SimpleProfileFragment extends Fragment implements FragmentBase { mmolView = (RadioButton) layout.findViewById(R.id.simpleprofile_mmol); icView = (EditText) layout.findViewById(R.id.simpleprofile_ic); isfView = (EditText) layout.findViewById(R.id.simpleprofile_isf); - carView = (EditText) layout.findViewById(R.id.simpleprofile_car); basalView = (EditText) layout.findViewById(R.id.simpleprofile_basalrate); targetlowView = (EditText) layout.findViewById(R.id.simpleprofile_targetlow); targethighView = (EditText) layout.findViewById(R.id.simpleprofile_targethigh); @@ -82,7 +80,6 @@ public class SimpleProfileFragment extends Fragment implements FragmentBase { diaView.setText(simpleProfilePlugin.dia.toString()); icView.setText(simpleProfilePlugin.ic.toString()); isfView.setText(simpleProfilePlugin.isf.toString()); - carView.setText(simpleProfilePlugin.car.toString()); basalView.setText(simpleProfilePlugin.basal.toString()); targetlowView.setText(simpleProfilePlugin.targetLow.toString()); targethighView.setText(simpleProfilePlugin.targetHigh.toString()); @@ -134,7 +131,6 @@ public class SimpleProfileFragment extends Fragment implements FragmentBase { simpleProfilePlugin.dia = SafeParse.stringToDouble(diaView.getText().toString()); simpleProfilePlugin.ic = SafeParse.stringToDouble(icView.getText().toString()); simpleProfilePlugin.isf = SafeParse.stringToDouble(isfView.getText().toString()); - simpleProfilePlugin.car = SafeParse.stringToDouble(carView.getText().toString()); simpleProfilePlugin.basal = SafeParse.stringToDouble(basalView.getText().toString()); simpleProfilePlugin.targetLow = SafeParse.stringToDouble(targetlowView.getText().toString()); simpleProfilePlugin.targetHigh = SafeParse.stringToDouble(targethighView.getText().toString()); @@ -145,7 +141,6 @@ public class SimpleProfileFragment extends Fragment implements FragmentBase { diaView.addTextChangedListener(textWatch); icView.addTextChangedListener(textWatch); isfView.addTextChangedListener(textWatch); - carView.addTextChangedListener(textWatch); basalView.addTextChangedListener(textWatch); targetlowView.addTextChangedListener(textWatch); targethighView.addTextChangedListener(textWatch); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SimpleProfile/SimpleProfilePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SimpleProfile/SimpleProfilePlugin.java index 4f9d4ad7d0..3264696feb 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/SimpleProfile/SimpleProfilePlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/SimpleProfile/SimpleProfilePlugin.java @@ -34,7 +34,6 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface { Double dia; Double ic; Double isf; - Double car; Double basal; Double targetLow; Double targetHigh; @@ -104,7 +103,6 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface { editor.putString("SimpleProfile" + "dia", dia.toString()); editor.putString("SimpleProfile" + "ic", ic.toString()); editor.putString("SimpleProfile" + "isf", isf.toString()); - editor.putString("SimpleProfile" + "car", car.toString()); editor.putString("SimpleProfile" + "basal", basal.toString()); editor.putString("SimpleProfile" + "targetlow", targetLow.toString()); editor.putString("SimpleProfile" + "targethigh", targetHigh.toString()); @@ -153,13 +151,6 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface { log.debug(e.getMessage()); } else isf = 200d; - if (settings.contains("SimpleProfile" + "car")) - try { - car = SafeParse.stringToDouble(settings.getString("SimpleProfile" + "car", "20")); - } catch (Exception e) { - log.debug(e.getMessage()); - } - else car = 20d; if (settings.contains("SimpleProfile" + "basal")) try { basal = SafeParse.stringToDouble(settings.getString("SimpleProfile" + "basal", "1")); @@ -232,7 +223,6 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface { json.put("store", store); profile.put("dia", dia); profile.put("carbratio", new JSONArray().put(new JSONObject().put("timeAsSeconds", 0).put("value", ic))); - profile.put("carbs_hr", car); profile.put("sens", new JSONArray().put(new JSONObject().put("timeAsSeconds", 0).put("value", isf))); profile.put("basal", new JSONArray().put(new JSONObject().put("timeAsSeconds", 0).put("value", basal))); profile.put("target_low", new JSONArray().put(new JSONObject().put("timeAsSeconds", 0).put("value", targetLow))); diff --git a/app/src/main/java/info/nightscout/client/data/NSProfile.java b/app/src/main/java/info/nightscout/client/data/NSProfile.java index ec431e69a8..2e732c8c9f 100644 --- a/app/src/main/java/info/nightscout/client/data/NSProfile.java +++ b/app/src/main/java/info/nightscout/client/data/NSProfile.java @@ -120,7 +120,7 @@ public class NSProfile { } return 3D; } - +/* public Double getCarbAbsorbtionRate() { return getCarbAbsorbtionRate(getDefaultProfile()); } @@ -137,7 +137,7 @@ public class NSProfile { } return 0D; } - +*/ // mmol or mg/dl public String getUnits() { return getUnits(getDefaultProfile()); diff --git a/app/src/main/res/layout/circadianpercentageprofile_fragment.xml b/app/src/main/res/layout/circadianpercentageprofile_fragment.xml index db5067d881..92d08c4a11 100644 --- a/app/src/main/res/layout/circadianpercentageprofile_fragment.xml +++ b/app/src/main/res/layout/circadianpercentageprofile_fragment.xml @@ -239,24 +239,6 @@ android:inputType="numberDecimal" /> - - - - - - - diff --git a/app/src/main/res/layout/localprofile_fragment.xml b/app/src/main/res/layout/localprofile_fragment.xml index 03b459eb9b..320e457598 100644 --- a/app/src/main/res/layout/localprofile_fragment.xml +++ b/app/src/main/res/layout/localprofile_fragment.xml @@ -16,9 +16,9 @@ + android:textAppearance="?android:attr/textAppearanceMedium" /> + android:textAppearance="?android:attr/textAppearanceMedium" /> - - - - - - - - + android:textAlignment="center" /> + android:orientation="vertical" /> + android:orientation="vertical" /> + + + + diff --git a/app/src/main/res/layout/simpleprofile_fragment.xml b/app/src/main/res/layout/simpleprofile_fragment.xml index f10b91e227..da04c97875 100644 --- a/app/src/main/res/layout/simpleprofile_fragment.xml +++ b/app/src/main/res/layout/simpleprofile_fragment.xml @@ -41,7 +41,7 @@ - - - - diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index b2a926a969..c38d35092b 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -230,7 +230,6 @@ Неправилно зададени стойности Виж профила DanaR профил - Усвояване на въглехидрати гр./ч. DIA (Време на действие на инсулина) ч.: Последен болус: Неправилни входни данни @@ -348,7 +347,6 @@ NS upload only (изключва синхронизацията) Моля изключете "NS upload only" за да използвате това. NS upload only. Not effective on SGV unless a local source like xDrip is selected. Not effective on Profiles while NS-Profiles is used. - Усвояване на ВХ (ч): Моля рестартирайте телефона или AndroidAPS, в противен случай информацията за грешки няма да се запише(важно за да се потвърди, че алгоритъмът работи правилно) Край на временен базал Старт на временен базал diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 5c08b40426..94f0360890 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -240,8 +240,7 @@ Jiný Senzor DanaR profil - Rychlost absorbce sacharidů - Rychlost inzulínu[h] + Celková doba aktivity inzulínu[h] Chyba při nastavení dočasného bazálu alarm hodinový bazál @@ -323,7 +322,6 @@ AndroidAPS restartován Dočasný bazál konec Dočasný bazál začátek - Rychlost absorbce sacharidů: Prosím restartujte Váš telefon nebo restartujte AndroidAPS z nastavení systému jinak nebudou zaznamenány ladící informace (důležité pro sledování a kontrolu, zda algoritmus pracuje správně) Bazální profil: Baterie v pumpě vybitá diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b2f802ea91..6db2e7134f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -221,7 +221,6 @@ Profil anzeigen DanaR Profil Einstellungen DIA [h] - Kohlehydrahte Absorptionsrate Manuell Einheiten (Tag) ungültige Eingabe @@ -309,7 +308,6 @@ Knopf 1 Knopf 2 Knopf 3 - Absorptionsrate: Config Builder vor %d min "AKT" diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c626d47456..229853e775 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -250,7 +250,6 @@ Cancelar Objetivo temporal Configuración perfil DanaR DIA [h] - Tasa de absorción de carbohidratos No se pudo actualizar el perfil basal Historial Recargar diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index fff140cc9b..befc382bd2 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -253,7 +253,6 @@ Temporary Target Cancel DanaR 프로파일 설정 인슐린활동시간(DIA) [h] - 탄수화물 흡수속도 [g/hour] 기초주입 프로파일 갱신 실패 History Reload @@ -350,7 +349,6 @@ mg/dl mmol/l DIA: - Absorption rate: Target range: Edit Base-Basal: Edit Base-ISF: diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 98242408e2..d2a8c75bd3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -263,8 +263,7 @@ Temporary Target Cancel DanaR profile settings DIA [h] - Carbs absorption rate - Failed to update basal profile + Failed to update basal profile History Reload Uploading @@ -362,7 +361,6 @@ mg/dl mmol/l DIA: - Absorption rate: Target range: Edit Base-Basal: Edit Base-ISF: diff --git a/app/src/main/res/xml/pref_danarprofile.xml b/app/src/main/res/xml/pref_danarprofile.xml index b88bb60f2e..1532d187de 100644 --- a/app/src/main/res/xml/pref_danarprofile.xml +++ b/app/src/main/res/xml/pref_danarprofile.xml @@ -8,11 +8,6 @@ android:key="danarprofile_dia" android:numeric="decimal" android:title="@string/danarprofile_dia" /> -