working NS uploader for treatments

sbalint · Oct 23, 2015 · 2d970f9 · 2d970f9
1 parent 4b44203
commit 2d970f9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/app/src/main/java/com/hypodiabetic/happ/EnterTreatment.java b/app/src/main/java/com/hypodiabetic/happ/EnterTreatment.java
@@ -284,6 +284,7 @@ public void saveTreatmentToDB(final View view){
                         public void onClick(DialogInterface dialog, int which) {
 
                             treatment.save();
+                            NSUploader.addTreatment(treatment, MainActivity.activity);
                             Toast.makeText(view.getContext(), treatment.value + " " + treatment.type + " saved, NOT sent to Pump", Toast.LENGTH_SHORT).show();
                             loadLastTreatments();
 

diff --git a/app/src/main/java/com/hypodiabetic/happ/integration/nightscout/NSUploader.java b/app/src/main/java/com/hypodiabetic/happ/integration/nightscout/NSUploader.java
@@ -41,7 +41,7 @@ public static void addTreatment(Treatments treatment, Context c){
             try {
                 treatmentJSON.put("enterdBy", "HAPP");
                 treatmentJSON.put("eventType", "HAPP_Treatment");
-                treatmentJSON.put("created_at", treatment.datetime);
+                treatmentJSON.put("created_at", treatment.datetime_display);
 
                 switch (treatment.type) {
                     case "Insulin":
@@ -56,7 +56,9 @@ public static void addTreatment(Treatments treatment, Context c){
                         return;
                 }
 
-                jsonPost(treatmentJSON, prefs.getString("nightscout_url", ""));
+                String url = prefs.getString("nightscout_url", "") + "/treatments/";
+
+                jsonPost(treatmentJSON, url);
 
             } catch (JSONException e) {
                 Crashlytics.logException(e);

diff --git a/app/src/main/java/com/hypodiabetic/happ/pumpAction.java b/app/src/main/java/com/hypodiabetic/happ/pumpAction.java
@@ -10,6 +10,7 @@
 import com.hypodiabetic.happ.Objects.Profile;
 import com.hypodiabetic.happ.Objects.TempBasal;
 import com.hypodiabetic.happ.Objects.Treatments;
+import com.hypodiabetic.happ.integration.nightscout.NSUploader;
 
 import java.util.Date;
 
@@ -183,10 +184,12 @@ public void onClick(DialogInterface dialog, int which) {
                             String toastMsg = "";
                             if (insulinTreatment.value != null) {
                                 insulinTreatment.save();
+                                NSUploader.addTreatment(insulinTreatment, MainActivity.activity);
                                 toastMsg += insulinTreatment.value + "U ";
                             }
                             if (carbTreatment.value != null) {
                                 carbTreatment.save();
+                                NSUploader.addTreatment(carbTreatment, MainActivity.activity);
                                 toastMsg += carbTreatment.value + "g ";
                             }