From 21a34344633720fd88a7d06c94217e603407d7b2 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Mon, 6 Jun 2016 11:24:17 +0200 Subject: [PATCH 1/5] fix activity contrib --- .../main/java/info/nightscout/androidaps/db/Treatment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/db/Treatment.java b/app/src/main/java/info/nightscout/androidaps/db/Treatment.java index 132e87bf14..807ca23f92 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/Treatment.java +++ b/app/src/main/java/info/nightscout/androidaps/db/Treatment.java @@ -87,12 +87,12 @@ public class Treatment { Double x1 = minAgo / 5d + 1; result.iobContrib = this.insulin * (1 - 0.001852 * x1 * x1 + 0.001852 * x1); // units: BG (mg/dL) = (BG/U) * U insulin * scalar - result.activityContrib = sens * this.insulin * (2 / dia / 60 / peak) * minAgo; + result.activityContrib = this.insulin * (2 / dia / 60 / peak) * minAgo; } else if (minAgo < end) { Double x2 = (minAgo - 75) / 5; result.iobContrib = this.insulin * (0.001323 * x2 * x2 - 0.054233 * x2 + 0.55556); - result.activityContrib = sens * this.insulin * (2 / dia / 60 - (minAgo - peak) * 2 / dia / 60 / (60 * dia - peak)); + result.activityContrib = this.insulin * (2 / dia / 60 - (minAgo - peak) * 2 / dia / 60 / (60 * dia - peak)); } } return result; From bd47fb86243761263d75c1107c65dfe4761e19ef Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Mon, 6 Jun 2016 12:17:37 +0200 Subject: [PATCH 2/5] button refresh treatments from nightscout --- .../Treatments/TreatmentsFragment.java | 27 +++++++++++++------ .../nightscout/client/broadcasts/Intents.java | 1 + .../main/res/layout/treatments_fragment.xml | 7 +++++ 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java index 6fb32c044d..79489c46ab 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java @@ -1,6 +1,7 @@ package info.nightscout.androidaps.plugins.Treatments; import android.content.Context; +import android.content.Intent; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v7.widget.CardView; @@ -9,6 +10,7 @@ import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import android.widget.TextView; import com.j256.ormlite.dao.Dao; @@ -34,8 +36,9 @@ import info.nightscout.androidaps.db.Treatment; import info.nightscout.androidaps.events.EventNewBG; import info.nightscout.androidaps.events.EventNewBasalProfile; import info.nightscout.androidaps.events.EventTreatmentChange; +import info.nightscout.client.broadcasts.Intents; -public class TreatmentsFragment extends Fragment { +public class TreatmentsFragment extends Fragment implements View.OnClickListener { private static Logger log = LoggerFactory.getLogger(TreatmentsFragment.class); RecyclerView recyclerView; @@ -43,6 +46,7 @@ public class TreatmentsFragment extends Fragment { TextView iobTotal; TextView activityTotal; + Button refreshFromNS; private static DecimalFormat formatNumber0decimalplaces = new DecimalFormat("0"); private static DecimalFormat formatNumber2decimalplaces = new DecimalFormat("0.00"); @@ -171,17 +175,24 @@ public class TreatmentsFragment extends Fragment { iobTotal = (TextView) view.findViewById(R.id.treatments_iobtotal); activityTotal = (TextView) view.findViewById(R.id.treatments_iobactivitytotal); + refreshFromNS = (Button) view.findViewById(R.id.treatments_reshreshfromnightscout); + + refreshFromNS.setOnClickListener(this); return view; } - /* - // TODO: Rename method, update argument and hook method into UI event - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onFragmentInteraction(uri); - } + @Override + public void onClick(View view) { + switch (view.getId()) { + case R.id.treatments_reshreshfromnightscout: + MainApp.getDbHelper().resetTreatments(); + initializeData(); + Intent restartNSClient = new Intent(Intents.ACTION_RESTART); + MainApp.instance().getApplicationContext().sendBroadcast(restartNSClient); + break; } - */ + } + @Override public void onAttach(Context context) { super.onAttach(context); diff --git a/app/src/main/java/info/nightscout/client/broadcasts/Intents.java b/app/src/main/java/info/nightscout/client/broadcasts/Intents.java index f667b048ed..8d921d879a 100644 --- a/app/src/main/java/info/nightscout/client/broadcasts/Intents.java +++ b/app/src/main/java/info/nightscout/client/broadcasts/Intents.java @@ -12,4 +12,5 @@ public interface Intents { // App -> NSClient String ACTION_DATABASE = "info.nightscout.client.DBACCESS"; + String ACTION_RESTART = "info.nightscout.client.RESTART"; } diff --git a/app/src/main/res/layout/treatments_fragment.xml b/app/src/main/res/layout/treatments_fragment.xml index 578e1b3900..1085adbc36 100644 --- a/app/src/main/res/layout/treatments_fragment.xml +++ b/app/src/main/res/layout/treatments_fragment.xml @@ -47,6 +47,13 @@ android:paddingLeft="10dp" /> +