From 38316bfd38c264c357970d2c8312e4a1884d3a96 Mon Sep 17 00:00:00 2001 From: evanwilliams Date: Sat, 27 Mar 2021 15:06:53 -0400 Subject: [PATCH] Fixed the valeus to booleans instead of doubles or integers --- .../DryWeatherScreening.java | 61 +++++++++++++++++-- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java index f49d2c4..8ff412f 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java @@ -36,7 +36,15 @@ public class DryWeatherScreening extends AppCompatActivity{ String maintenanceVal = ""; String screenVal = ""; - FormElementTextEmail element11; + boolean flowPres = false; + boolean odorPres = false; + boolean colorPres = false; + boolean polutantsPres = false; + boolean obstructionPres = false; + boolean needMaintenance = false; + boolean screenOK = false; + + //I assume onCreate is important so I will leave it unchanged protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -50,24 +58,31 @@ private void setupForm() { FormElementTextSingleLine flow = FormElementTextSingleLine.createInstance().setTitle("Presence of Flow").setValue("No"); flowVal = flow.getValue(); + flowPres = convertToBoolean(flowVal); FormElementTextSingleLine odor = FormElementTextSingleLine.createInstance().setTitle("Unusual Odor").setValue("No"); odorVal = odor.getValue(); + odorPres = convertToBoolean(odorVal); FormElementTextSingleLine color = FormElementTextSingleLine.createInstance().setTitle("Unusual Color").setValue("No"); colorVal = color.getValue(); + colorPres = convertToBoolean(colorVal); - FormElementTextSingleLine polutants = FormElementTextSingleLine.createInstance().setTitle("Polutants Nearby"); + FormElementTextSingleLine polutants = FormElementTextSingleLine.createInstance().setTitle("Polutants Nearby").setValue("No"); polutantsVal = polutants.getValue(); + polutantsPres = convertToBoolean(polutantsVal) - FormElementTextSingleLine obstruction = FormElementTextSingleLine.createInstance().setTitle("Obstruction"); + FormElementTextSingleLine obstruction = FormElementTextSingleLine.createInstance().setTitle("Obstruction").setValue("No"); obstructionVal = obstruction.getValue(); + obstructionPres = convertToBoolean(obstructionVal); - FormElementTextSingleLine maintenance = FormElementTextSingleLine.createInstance().setTitle("Needs Maintenance"); + FormElementTextSingleLine maintenance = FormElementTextSingleLine.createInstance().setTitle("Needs Maintenance").setValue("No"); maintenanceVal = maintenance.getValue(); + needMaintenance = convertToBoolean(maintenanceVal); - FormElementTextSingleLine screen = FormElementTextSingleLine.createInstance().setTitle("Screen OK"); + FormElementTextSingleLine screen = FormElementTextSingleLine.createInstance().setTitle("Screen OK").setValue("No"); screenVal = screen.getValue(); + screenOK = convertToBoolean(screenVal); List formItems = new ArrayList<>(); @@ -81,4 +96,40 @@ private void setupForm() { formBuilder.addFormElements(formItems); } + + public boolean getFlow() { + return flowPres; + } + + public boolean getOdor() { + return odorPres; + } + + public boolean getColor() { + return colorPres; + } + + public boolean getPolutants() { + return polutantsPres; + } + + public boolean getObstruction() { + return obstructionPres; + } + + public boolean getMaintenance() { + return needMaintenance; + } + + public boolean getScreen() { + return screenOK; + } + + public boolean convertToBoolean(String s) { + if (s.compareTo("Yes") == 0) { + return true; + } else { + return false; + } + } }