Validate new metric's readings.

Paolo Rotolo · Paolo Rotolo · commit 2748787688ac · 2016-01-05T13:50:04.000+01:00
diff --git a/app/src/main/java/org/glucosio/android/presenter/AddCholesterolPresenter.java b/app/src/main/java/org/glucosio/android/presenter/AddCholesterolPresenter.java
@@ -1,10 +1,8 @@
 package org.glucosio.android.presenter;
 
 import org.glucosio.android.activity.AddCholesterolActivity;
-import org.glucosio.android.activity.AddPressureActivity;
 import org.glucosio.android.db.CholesterolReading;
 import org.glucosio.android.db.DatabaseHandler;
-import org.glucosio.android.db.PressureReading;
 import org.glucosio.android.tools.ReadingTools;
 import org.glucosio.android.tools.SplitDateTime;
 
@@ -60,7 +58,7 @@ public int hourToSpinnerType(int hour){
     }
 
     public void dialogOnAddButtonPressed(String time, String date, String totalCho, String LDLCho, String HDLCho){
-        if (validateDate(date) && validateTime(time)) {
+        if (validateEmpty(date) && validateEmpty(time) && validateEmpty(totalCho) && validateEmpty(LDLCho) && validateEmpty(HDLCho)) {
 
             Calendar cal = Calendar.getInstance();
             cal.set(Integer.parseInt(readingYear), Integer.parseInt(readingMonth)-1, Integer.parseInt(readingDay), Integer.parseInt(readingHour), Integer.parseInt(readingMinute));
@@ -77,13 +75,9 @@ public void dialogOnAddButtonPressed(String time, String date, String totalCho,
         }
     }
 
-    private boolean validateTime(String time){
+    private boolean validateEmpty(String time){
         return !time.equals("");
     }
-    private boolean validateDate(String date){
-        return !date.equals("");
-    }
-
     // Getters and Setters
 
     public String getUnitMeasuerement(){
diff --git a/app/src/main/java/org/glucosio/android/presenter/AddHB1ACPresenter.java b/app/src/main/java/org/glucosio/android/presenter/AddHB1ACPresenter.java
@@ -58,8 +58,7 @@ public int hourToSpinnerType(int hour){
     }
 
     public void dialogOnAddButtonPressed(String time, String date, String reading){
-        if (validateDate(date) && validateTime(time)) {
-
+        if (validateEmpty(date) && validateEmpty(time) && validateEmpty(reading)) {
             Calendar cal = Calendar.getInstance();
             cal.set(Integer.parseInt(readingYear), Integer.parseInt(readingMonth)-1, Integer.parseInt(readingDay), Integer.parseInt(readingHour), Integer.parseInt(readingMinute));
             Date finalDateTime = cal.getTime();
@@ -73,12 +72,9 @@ public void dialogOnAddButtonPressed(String time, String date, String reading){
         }
     }
 
-    private boolean validateTime(String time){
+    private boolean validateEmpty(String time){
         return !time.equals("");
     }
-    private boolean validateDate(String date){
-        return !date.equals("");
-    }
 
     // Getters and Setters
 
diff --git a/app/src/main/java/org/glucosio/android/presenter/AddKetonePresenter.java b/app/src/main/java/org/glucosio/android/presenter/AddKetonePresenter.java
@@ -58,7 +58,7 @@ public int hourToSpinnerType(int hour){
     }
 
     public void dialogOnAddButtonPressed(String time, String date, String reading){
-        if (validateDate(date) && validateTime(time)) {
+        if (validateEmpty(date) && validateEmpty(time) && validateEmpty(reading)) {
 
             Calendar cal = Calendar.getInstance();
             cal.set(Integer.parseInt(readingYear), Integer.parseInt(readingMonth)-1, Integer.parseInt(readingDay), Integer.parseInt(readingHour), Integer.parseInt(readingMinute));
@@ -73,12 +73,9 @@ public void dialogOnAddButtonPressed(String time, String date, String reading){
         }
     }
 
-    private boolean validateTime(String time){
+    private boolean validateEmpty(String time){
         return !time.equals("");
     }
-    private boolean validateDate(String date){
-        return !date.equals("");
-    }
 
     // Getters and Setters
 
diff --git a/app/src/main/java/org/glucosio/android/presenter/AddPressurePresenter.java b/app/src/main/java/org/glucosio/android/presenter/AddPressurePresenter.java
@@ -58,8 +58,7 @@ public int hourToSpinnerType(int hour){
     }
 
     public void dialogOnAddButtonPressed(String time, String date, String minReading, String maxReading){
-        if (validateDate(date) && validateTime(time)) {
-
+        if (validateEmpty(date) && validateEmpty(time) && validateEmpty(minReading) && validateEmpty(maxReading)) {
             Calendar cal = Calendar.getInstance();
             cal.set(Integer.parseInt(readingYear), Integer.parseInt(readingMonth)-1, Integer.parseInt(readingDay), Integer.parseInt(readingHour), Integer.parseInt(readingMinute));
             Date finalDateTime = cal.getTime();
@@ -74,12 +73,9 @@ public void dialogOnAddButtonPressed(String time, String date, String minReading
         }
     }
 
-    private boolean validateTime(String time){
+    private boolean validateEmpty(String time){
         return !time.equals("");
     }
-    private boolean validateDate(String date){
-        return !date.equals("");
-    }
 
     // Getters and Setters
 
diff --git a/app/src/main/java/org/glucosio/android/presenter/AddWeightPresenter.java b/app/src/main/java/org/glucosio/android/presenter/AddWeightPresenter.java
@@ -58,8 +58,7 @@ public int hourToSpinnerType(int hour){
     }
 
     public void dialogOnAddButtonPressed(String time, String date, String reading){
-        if (validateDate(date) && validateTime(time)) {
-
+        if (validateEmpty(date) && validateEmpty(time) && validateEmpty(reading)) {
             Calendar cal = Calendar.getInstance();
             cal.set(Integer.parseInt(readingYear), Integer.parseInt(readingMonth)-1, Integer.parseInt(readingDay), Integer.parseInt(readingHour), Integer.parseInt(readingMinute));
             Date finalDateTime = cal.getTime();
@@ -73,12 +72,9 @@ public void dialogOnAddButtonPressed(String time, String date, String reading){
         }
     }
 
-    private boolean validateTime(String time){
+    private boolean validateEmpty(String time){
         return !time.equals("");
     }
-    private boolean validateDate(String date){
-        return !date.equals("");
-    }
 
     // Getters and Setters
 

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,7 @@ public int hourToSpinnerType(int hour){`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`public void dialogOnAddButtonPressed(String time, String date, String reading){`
`61`		`- if (validateDate(date) && validateTime(time)) {`
`62`		`-`
	`61`	`+ if (validateEmpty(date) && validateEmpty(time) && validateEmpty(reading)) {`
`63`	`62`	`Calendar cal = Calendar.getInstance();`
`64`	`63`	`cal.set(Integer.parseInt(readingYear), Integer.parseInt(readingMonth)-1, Integer.parseInt(readingDay), Integer.parseInt(readingHour), Integer.parseInt(readingMinute));`
`65`	`64`	`Date finalDateTime = cal.getTime();`
`@@ -73,12 +72,9 @@ public void dialogOnAddButtonPressed(String time, String date, String reading){`
`73`	`72`	`}`
`74`	`73`	`}`
`75`	`74`
`76`		`- private boolean validateTime(String time){`
	`75`	`+ private boolean validateEmpty(String time){`
`77`	`76`	`return !time.equals("");`
`78`	`77`	`}`
`79`		`- private boolean validateDate(String date){`
`80`		`- return !date.equals("");`
`81`		`- }`
`82`	`78`
`83`	`79`	`// Getters and Setters`
`84`	`80`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public int hourToSpinnerType(int hour){`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`public void dialogOnAddButtonPressed(String time, String date, String reading){`
`61`		`- if (validateDate(date) && validateTime(time)) {`
	`61`	`+ if (validateEmpty(date) && validateEmpty(time) && validateEmpty(reading)) {`
`62`	`62`
`63`	`63`	`Calendar cal = Calendar.getInstance();`
`64`	`64`	`cal.set(Integer.parseInt(readingYear), Integer.parseInt(readingMonth)-1, Integer.parseInt(readingDay), Integer.parseInt(readingHour), Integer.parseInt(readingMinute));`
`@@ -73,12 +73,9 @@ public void dialogOnAddButtonPressed(String time, String date, String reading){`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`76`		`- private boolean validateTime(String time){`
	`76`	`+ private boolean validateEmpty(String time){`
`77`	`77`	`return !time.equals("");`
`78`	`78`	`}`
`79`		`- private boolean validateDate(String date){`
`80`		`- return !date.equals("");`
`81`		`- }`
`82`	`79`
`83`	`80`	`// Getters and Setters`
`84`	`81`