Merge pull request #1 from canthonyscott/newHistoryLogging

Newhistorylogging
canthonyscott · Apr 14, 2016 · 46d687a · 46d687a
2 parents 8eab2b3 + e29f703
commit 46d687a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 42 deletions.
diff --git a/app/app-release.apk b/app/app-release.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "com.canthonyscott.microinjectioncalc"
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 17
-        versionName "1.2"
+        versionCode 18
+        versionName "1.2.5"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/com/canthonyscott/microinjectioncalc/LogHistory.java b/app/src/main/java/com/canthonyscott/microinjectioncalc/LogHistory.java
@@ -36,61 +36,34 @@ public class LogHistory extends AsyncTask <Void, Void, Void> {
     private String actionToLog;
     private GetNetworkResource getNetworkResource;
 
-
-
-
-
-    // constructor to send a simple action log to the database
     public LogHistory(Context context, String actionToLog) {
         String uniqueID = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
         Log.d("LogHistory","uniqueID: " + uniqueID);
         this.actionToLog = actionToLog;
         getNetworkResource = new GetNetworkResource(context, "logHistory.php");
 
-        paramData.put("historyType", "simple");
+        paramData.put("historyType", "event");
         paramData.put("uniqueID", uniqueID);
         paramData.put("action", actionToLog);
 
     }
 
-    // constructor that will send a log action, and send an oligo injection log
-    public LogHistory(Context context, String actionToLog, String dilution1, String dilution2, String mm, String oligo, String pumps, String nanograms) {
-        String uniqueID = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
+    public LogHistory(Context context, String type, String reagent, String concentration, String mm, String pumps, String nanoliters, String picograms, String dilution1, String dilution2){
         getNetworkResource = new GetNetworkResource(context, "logHistory.php");
-        this.actionToLog = actionToLog;
-        paramData.put("uniqueID", uniqueID);
-        paramData.put("historyType", "complex");
-        paramData.put("action", actionToLog);
-        paramData.put("mm", mm);
-        paramData.put("pumps", pumps);
-
-
-        paramData.put("type", "oligo");
-        paramData.put("dilution1", dilution1);
-        paramData.put("dilution2", dilution2);
-        paramData.put("oligo", oligo);
-        paramData.put("nanograms", nanograms);
-    }
-
-    public LogHistory(Context context, String actionToLog, String concentration, String mm, String pumps, String nanoliters, String picograms) {
         String uniqueID = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
-        getNetworkResource = new GetNetworkResource(context, "logHistory.php");
-        this.actionToLog = actionToLog;
+        paramData.put("historyType", "injection");
         paramData.put("uniqueID", uniqueID);
-        paramData.put("historyType", "complex");
-        paramData.put("action", actionToLog);
+        paramData.put("type", type);
         paramData.put("mm", mm);
         paramData.put("pumps", pumps);
         paramData.put("nanoliters", nanoliters);
         paramData.put("picograms", picograms);
-        paramData.put("type", "rna");
         paramData.put("concentration", concentration);
-    }
-
-
-
-
+        paramData.put("reagent", reagent);
+        paramData.put("dilution1", dilution1);
+        paramData.put("dilution2", dilution2);
 
+    }
 
     @Override
     protected Void doInBackground(Void... params) {
@@ -129,7 +102,6 @@ private void sendHttpRequest() {
 
         // connect
         try {
-            url = new URL(getNetworkResource.getUrl());
             conn = getNetworkResource.getSSLUrlConnection();
             conn.setDoInput(true);
             conn.setDoOutput(true);

diff --git a/app/src/main/java/com/canthonyscott/microinjectioncalc/#.java b/app/src/main/java/com/canthonyscott/microinjectioncalc/#.java
@@ -144,7 +144,7 @@ protected void onPostExecute(String s) {
 //                    editor.putString("networkID",networkID);
 //                    editor.commit();
                     // close activity and reload MO injection
-                    LogHistory logHistory = new LogHistory(getApplicationContext(), "Login");
+                    LogHistory logHistory = new LogHistory(getApplicationContext(),"Login");
                     logHistory.execute();
                     finish();
                     startActivity(new Intent(context, MOInjection.class));

diff --git a/app/src/main/java/com/canthonyscott/microinjectioncalc/MOInjection.java b/app/src/main/java/com/canthonyscott/microinjectioncalc/MOInjection.java
@@ -162,6 +162,7 @@ public void onNothingSelected(AdapterView<?> parent) {
 
         //Set onClickListener for Calculate button
         Button calculate = (Button) findViewById(R.id.calculate);
+        assert calculate != null;
         calculate.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -213,7 +214,7 @@ public void onClick(View v) {
                 injectionQuantity = Double.parseDouble(new DecimalFormat("#####.##").format(injectionQuantity));
                 injectionQuantityResult.setText(injectionQuantity.toString());
 
-                LogHistory logHistory = new LogHistory(getApplicationContext(), "MicroInjection", dilution1.getText().toString(), dilution2.getText().toString(), numberOfMillimeters.getText().toString(),selectedMO.getGene(),numberOfPumps.getText().toString(),injectionQuantity.toString());
+                LogHistory logHistory = new LogHistory(getApplicationContext(), "Oligo", selectedMO.getGene(), injectionConcentration.toString(), numberOfMillimeters.getText().toString(),numberOfPumps.getText().toString(),injectionVolume.toString(),injectionQuantity.toString(),dilution1.getText().toString(), dilution2.getText().toString());
                 logHistory.execute();
 
             }

diff --git a/app/src/main/java/com/canthonyscott/microinjectioncalc/RNAInjection.java b/app/src/main/java/com/canthonyscott/microinjectioncalc/RNAInjection.java
@@ -39,7 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
 //        });
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-
+        assert calculate != null;
         calculate.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -75,7 +75,8 @@ public void onClick(View v) {
                 injectionQuantityPg.setText(picogramsInjected.toString());
                 // log history to database
 //                LogHistory logHistory = new LogHistory(getApplicationContext(), "RNAInjection");
-                LogHistory logHistory = new LogHistory(getApplicationContext(), "RNAInjection", concentrationOfRNA.getText().toString(), numberOfMm.getText().toString(), numberOfPumps.getText().toString(), injectionVolume.toString(), picogramsInjected.toString());
+//                LogHistory logHistory = new LogHistory(getApplicationContext(), "RNAInjection", concentrationOfRNA.getText().toString(), numberOfMm.getText().toString(), numberOfPumps.getText().toString(), injectionVolume.toString(), picogramsInjected.toString());
+                LogHistory logHistory = new LogHistory(getApplicationContext(), "RNA", "RNA", concentrationOfRNA.getText().toString(), numberOfMm.getText().toString(), numberOfPumps.getText().toString(),injectionVolume.toString(),picogramsInjected.toString(),"na", "na");
                 logHistory.execute();
             }
         });