From bb28e54f5383dfac0d9fc307309dc3bd7b605c84 Mon Sep 17 00:00:00 2001 From: evanwilliams Date: Thu, 25 Mar 2021 20:48:44 -0400 Subject: [PATCH 01/10] Fixed extra fields --- .../DryWeatherScreening.java | 43 ++++++------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java index 8fade11..f49d2c4 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java @@ -48,51 +48,36 @@ private void setupForm() { formBuilder = new FormBuilder(this, recyclerView); FormHeader title = (FormHeader) new FormHeader().setTitle("Dry Weather Screening"); - //Outfall --> Question: How do you do a subheading? - FormElementTextSingleLine flow = new FormElementTextSingleLine().setTitle("Presence of Flow"); - FormElementTextNumber flowData = FormElementTextNumber.createInstance(); //what data type is this? - flowVal = flowData.getValue(); + FormElementTextSingleLine flow = FormElementTextSingleLine.createInstance().setTitle("Presence of Flow").setValue("No"); + flowVal = flow.getValue(); - FormElementTextSingleLine odor = new FormElementTextSingleLine().setTitle("Unusual Odor"); - FormElementTextNumber odorData = FormElementTextNumber.createInstance(); - odorVal = odorData.getValue(); + FormElementTextSingleLine odor = FormElementTextSingleLine.createInstance().setTitle("Unusual Odor").setValue("No"); + odorVal = odor.getValue(); - FormElementTextSingleLine color = new FormElementTextSingleLine().setTitle("Unusual Color"); - FormElementTextNumber colorData = FormElementTextNumber.createInstance(); - colorVal = colorData.getValue(); + FormElementTextSingleLine color = FormElementTextSingleLine.createInstance().setTitle("Unusual Color").setValue("No"); + colorVal = color.getValue(); - FormElementTextSingleLine polutants = new FormElementTextSingleLine().setTitle("Polutants Nearby"); - FormElementTextNumber polutantsData = FormElementTextNumber.createInstance(); - polutantsVal = polutantsData.getValue(); + FormElementTextSingleLine polutants = FormElementTextSingleLine.createInstance().setTitle("Polutants Nearby"); + polutantsVal = polutants.getValue(); - FormElementTextSingleLine obstruction = new FormElementTextSingleLine().setTitle("Obstruction"); - FormElementTextNumber obstructionData = FormElementTextNumber.createInstance(); - obstructionVal = obstructionData.getValue(); + FormElementTextSingleLine obstruction = FormElementTextSingleLine.createInstance().setTitle("Obstruction"); + obstructionVal = obstruction.getValue(); - FormElementTextSingleLine maintenance = new FormElementTextSingleLine().setTitle("Needs Maintenance"); - FormElementTextNumber maintenanceData = FormElementTextNumber.createInstance(); - maintenanceVal = maintenanceData.getValue(); + FormElementTextSingleLine maintenance = FormElementTextSingleLine.createInstance().setTitle("Needs Maintenance"); + maintenanceVal = maintenance.getValue(); - FormElementTextSingleLine screen = new FormElementTextSingleLine().setTitle("Screen OK"); - FormElementTextNumber screenData = FormElementTextNumber.createInstance(); - screenVal = screenData.getValue(); + FormElementTextSingleLine screen = FormElementTextSingleLine.createInstance().setTitle("Screen OK"); + screenVal = screen.getValue(); List formItems = new ArrayList<>(); formItems.add(flow); - formItems.add(flowData); formItems.add(odor); - formItems.add(odorData); formItems.add(color); - formItems.add(colorData); formItems.add(polutants); - formItems.add(polutantsData); formItems.add(obstruction); - formItems.add(obstructionData); formItems.add(maintenance); - formItems.add(maintenanceData); formItems.add(screen); - formItems.add(screenData); formBuilder.addFormElements(formItems); } From 2ed4a461b686361a984bae4b857a39a7cd5c543e Mon Sep 17 00:00:00 2001 From: evanwilliams Date: Thu, 25 Mar 2021 21:04:41 -0400 Subject: [PATCH 02/10] generalf orm --- .../WaterWay/General.java | 107 ++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java new file mode 100644 index 0000000..dc1d03c --- /dev/null +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java @@ -0,0 +1,107 @@ +package com.sf.stormwaterutilityandroid.WaterWay; + +import android.os.Bundle; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.RecyclerView; + +import com.sf.stormwaterutilityandroid.R; + +import java.util.ArrayList; +import java.util.List; + +import me.riddhimanadib.formmaster.FormBuilder; +import me.riddhimanadib.formmaster.model.BaseFormElement; +import me.riddhimanadib.formmaster.model.FormElementPickerDate; +import me.riddhimanadib.formmaster.model.FormElementPickerMulti; +import me.riddhimanadib.formmaster.model.FormElementPickerSingle; +import me.riddhimanadib.formmaster.model.FormElementPickerTime; +import me.riddhimanadib.formmaster.model.FormElementSwitch; +import me.riddhimanadib.formmaster.model.FormElementTextEmail; +import me.riddhimanadib.formmaster.model.FormElementTextMultiLine; +import me.riddhimanadib.formmaster.model.FormElementTextNumber; +import me.riddhimanadib.formmaster.model.FormElementTextPassword; +import me.riddhimanadib.formmaster.model.FormElementTextPhone; +import me.riddhimanadib.formmaster.model.FormElementTextSingleLine; +import me.riddhimanadib.formmaster.model.FormHeader; + +public class General { + //HQ form + private FormBuilder formBuilder; + private RecyclerView recyclerView; + + String nameOfInspector = ""; + String nameOfSite = ""; + String dateRow = ""; + + double outfall = 0.0; + double longitude = 0.0; + double latitude = 0.0; + double invertElevation = 0.0; + + String type = ""; + String pipeSize = ""; + String channelBottomWidth = ""; + String receivingWater = ""; + String routineEvaluation = ""; + String complaintInvestigation = ""; + + String comments = ""; + + /*protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_sample_fordm); + recyclerView = findViewById(R.id.recyclerView2); + setupForm(); + }*/ + + private void setupForm() { + formBuilder = new FormBuilder(this, recyclerView); + + FormHeader title = (FormHeader) new FormHeader().setTitle("Report"); + + FormElementTextSingleLine name = FormElementTextSingleLine.createInstance().setTitle("Name of Inspector").setValue(""); + nameOfInspector = name.getValue(); + + FormElementTextSingleLine site = FormElementTextSingleLine.createInstance().setTitle("Name of site").setValue(""); + nameOfSite = site.getValue(); + + FormElementPickerDate date = FormElementPickerDate.createInstance().setTitle("Date Row").setDateFormat("XX-XX-XXXX").setValue(""); + dateRow = date.getValue(); + + FormElementTextSingleLine outfallValue = FormElementTextSingleLine.createInstance().setTitle("Outfall").setValue("0"); + outfall = Double.parseDouble(outfallValue.getValue()); + + FormElementTextSingleLine longitudeValue = FormElementTextSingleLine.createInstance().setTitle("Longitude").setValue("0"); + longitude = Double.parseDouble(longitudeValue.getValue()); + + FormElementTextSingleLine latitudeValue = FormElementTextSingleLine.createInstance().setTitle("Latitude").setValue("0"); + latitude = Double.parseDouble(latitudeValue.getValue()); + + FormElementTextSingleLine invertElevationValue = FormElementTextSingleLine.createInstance().setTitle("Invert Elevation").setValue("0"); + invertElevation = Double.parseDouble(invertElevationValue.getValue()); + + FormElementTextSingleLine typeValue = FormElementTextSingleLine.createInstance().setTitle("Type").setValue(""); + type = typeValue.getValue(); + + FormElementTextSingleLine pipeSizeValue = FormElementTextSingleLine.createInstance().setTitle("Pipe Size").setValue(""); + pipeSize = pipeSizeValue.getValue(); + + FormElementTextSingleLine channelBottomWidthValue = FormElementTextSingleLine.createInstance().setTitle("Channel Bottom Width") + .setValue(""); + channelBottomWidth = channelBottomWidthValue.getValue(); + + FormElementTextSingleLine receiving = FormElementTextSingleLine.createInstance().setTitle("Receiving Water").setValue(""); + receivingWater = receiving.getValue(); + + FormElementTextSingleLine routine = FormElementTextSingleLine.createInstance().setTitle("Routine Evaluation").setValue(""); + routineEvaluation = routine.getValue(); + + FormElementTextSingleLine complaint = FormElementTextSingleLine.createInstance().setTitle("Complaint Investigation").setValue(""); + complaintInvestigation = complaint.getValue(); + + FormElementTextSingleLine commentsValue = FormElementTextSingleLine.createInstance().setTitle("Comments").setValue(""); + comments = commentsValue.getValue(); + } + +} From 4bd7003b75aa6bcc6cb93063f5ed3bbd590fd3ae Mon Sep 17 00:00:00 2001 From: evanwilliams Date: Thu, 25 Mar 2021 21:09:11 -0400 Subject: [PATCH 03/10] More changes to general --- .../WaterWay/General.java | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java index dc1d03c..da1e6a5 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java @@ -104,4 +104,59 @@ private void setupForm() { comments = commentsValue.getValue(); } + public String getName() { + return nameOfInspector; + } + + public String getSite() { + return nameOfSite; + } + + public String getDate() { + return dateRow; + } + + public double getOutfall() { + return outfall; + } + + public double getLongitude() { + return longitude; + } + + public double getLatitude() { + return latitude; + } + + public double getInvertElevation() { + return invertElevation; + } + + public String getType() { + return type; + } + + public String getPipeSize() { + return pipeSize; + } + + public String getChannelBottomWidth() { + return channelBottomWidth; + } + + public String getReceivingWater() { + return receivingWater; + } + + public String getRoutineEvaluation() { + return routineEvaluation; + } + + public String getComplaintInvestigation() { + return complaintInvestigation; + } + + public String getComments() { + return comments; + } } From 38316bfd38c264c357970d2c8312e4a1884d3a96 Mon Sep 17 00:00:00 2001 From: evanwilliams Date: Sat, 27 Mar 2021 15:06:53 -0400 Subject: [PATCH 04/10] 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; + } + } } From ca14a7a77fbf99c6afd6652398436606108f2561 Mon Sep 17 00:00:00 2001 From: evanwilliams Date: Sat, 27 Mar 2021 22:12:44 -0400 Subject: [PATCH 05/10] Switched most text fields to pickers --- .../DryWeatherScreening.java | 19 +++--- .../WaterWay/General.java | 60 +++++++++++++++---- 2 files changed, 58 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java index 45b04c0..2bd9d01 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java @@ -56,31 +56,30 @@ private void setupForm() { formBuilder = new FormBuilder(this, recyclerView); FormHeader title = (FormHeader) new FormHeader().setTitle("Dry Weather Screening"); - FormElementTextSingleLine flow = FormElementTextSingleLine.createInstance().setTitle("Presence of Flow").setValue("No"); - flowVal = flow.getValue(); - flowPres = convertToBoolean(flowVal); + FormElementSwitch flow = FormElementSwitch.createInstance().setTitle("Presence of Flow").setSwitchTexts("Yes", "No"); + flowPres = convertToBoolean(flow.getValue()); - FormElementTextSingleLine odor = FormElementTextSingleLine.createInstance().setTitle("Unusual Odor").setValue("No"); + FormElementSwitch odor = FormElementSwitch.createInstance().setTitle("Unusual Odor").setSwitchTexts("Yes", "No"); odorVal = odor.getValue(); odorPres = convertToBoolean(odorVal); - FormElementTextSingleLine color = FormElementTextSingleLine.createInstance().setTitle("Unusual Color").setValue("No"); + FormElementSwitch color = FormElementSwitch.createInstance().setTitle("Unusual Color").setSwitchTexts("Yes", "No"); colorVal = color.getValue(); colorPres = convertToBoolean(colorVal); - FormElementTextSingleLine polutants = FormElementTextSingleLine.createInstance().setTitle("Polutants Nearby").setValue("No"); + FormElementSwitch polutants = FormElementSwitch.createInstance().setTitle("Polutants Nearby").setSwitchTexts("Yes", "No"); polutantsVal = polutants.getValue(); - polutantsPres = convertToBoolean(polutantsVal) + polutantsPres = convertToBoolean(polutantsVal); - FormElementTextSingleLine obstruction = FormElementTextSingleLine.createInstance().setTitle("Obstruction").setValue("No"); + FormElementSwitch obstruction = FormElementSwitch.createInstance().setTitle("Obstruction").setSwitchTexts("Yes", "No"); obstructionVal = obstruction.getValue(); obstructionPres = convertToBoolean(obstructionVal); - FormElementTextSingleLine maintenance = FormElementTextSingleLine.createInstance().setTitle("Needs Maintenance").setValue("No"); + FormElementSwitch maintenance = FormElementSwitch.createInstance().setTitle("Needs Maintenance").setSwitchTexts("Yes", "No"); maintenanceVal = maintenance.getValue(); needMaintenance = convertToBoolean(maintenanceVal); - FormElementTextSingleLine screen = FormElementTextSingleLine.createInstance().setTitle("Screen OK").setValue("No"); + FormElementSwitch screen = FormElementSwitch.createInstance().setTitle("Screen OK").setSwitchTexts("Yes", "No"); screenVal = screen.getValue(); screenOK = convertToBoolean(screenVal); diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java index da1e6a5..4c53de8 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java @@ -48,12 +48,13 @@ public class General { String comments = ""; - /*protected void onCreate(Bundle savedInstanceState) { + @Override + protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_sample_fordm); recyclerView = findViewById(R.id.recyclerView2); setupForm(); - }*/ + } private void setupForm() { formBuilder = new FormBuilder(this, recyclerView); @@ -81,19 +82,56 @@ private void setupForm() { FormElementTextSingleLine invertElevationValue = FormElementTextSingleLine.createInstance().setTitle("Invert Elevation").setValue("0"); invertElevation = Double.parseDouble(invertElevationValue.getValue()); - FormElementTextSingleLine typeValue = FormElementTextSingleLine.createInstance().setTitle("Type").setValue(""); + List pipeTypeOptions = new ArrayList(); + pipeTypeOptions.add("Enclosed Pipe"); + pipeTypeOptions.add("Open Channel"); + FormElementPickerSingle typeValue = FormElementPickerSingle.createInstance().setTitle("Type").setOptions(pipeTypeOptions); type = typeValue.getValue(); - FormElementTextSingleLine pipeSizeValue = FormElementTextSingleLine.createInstance().setTitle("Pipe Size").setValue(""); + List pipeSizeOptions = new ArrayList(); + pipeSizeOptions.add("4\""); + pipeSizeOptions.add("6\""); + pipeSizeOptions.add("8\""); + pipeSizeOptions.add("10\""); + pipeSizeOptions.add("12\""); + pipeSizeOptions.add("14\""); + pipeSizeOptions.add("16\""); + pipeSizeOptions.add("18\""); + pipeSizeOptions.add("20\""); + pipeSizeOptions.add("24\""); + pipeSizeOptions.add("36\""); + FormElementPickerSingle pipeSizeValue = FormElementPickerSingle.createInstance().setTitle("Pipe Size").setOptions(pipeSizeOptions); pipeSize = pipeSizeValue.getValue(); - FormElementTextSingleLine channelBottomWidthValue = FormElementTextSingleLine.createInstance().setTitle("Channel Bottom Width") - .setValue(""); + List channelWidthOptions = new ArrayList receivingWaterOptions = new ArrayList(); + receivingWaterOptions.add("Turkey Creek"); + receivingWaterOptions.add("Deep River"); + receivingWaterOptions.add("Un-Named Tributary"); + receivingWaterOptions.add("Spring Run Ditch"); + receivingWaterOptions.add("Hart Ditch"); + receivingWaterOptions.add("Coffee Creek"); + receivingWaterOptions.add("Niles Ditch"); + receivingWaterOptions.add("Beaver Dam Ditch"); + receivingWaterOptions.add("Kaiser Ditch"); + + FormElementPickerSingle receiving = FormElementPickerSingle.createInstance().setTitle("Receiving Water").setOptions(receivingWaterOptions); receivingWater = receiving.getValue(); - + /* FormElementTextSingleLine routine = FormElementTextSingleLine.createInstance().setTitle("Routine Evaluation").setValue(""); routineEvaluation = routine.getValue(); @@ -101,7 +139,7 @@ private void setupForm() { complaintInvestigation = complaint.getValue(); FormElementTextSingleLine commentsValue = FormElementTextSingleLine.createInstance().setTitle("Comments").setValue(""); - comments = commentsValue.getValue(); + comments = commentsValue.getValue();*/ } public String getName() { @@ -148,7 +186,7 @@ public String getReceivingWater() { return receivingWater; } - public String getRoutineEvaluation() { + /*public String getRoutineEvaluation() { return routineEvaluation; } @@ -158,5 +196,5 @@ public String getComplaintInvestigation() { public String getComments() { return comments; - } + }*/ } From e774cf6dd65ac09459fe6c1987a854a011d1d0bb Mon Sep 17 00:00:00 2001 From: evanwilliams Date: Sat, 27 Mar 2021 22:21:23 -0400 Subject: [PATCH 06/10] fixed General to use multi-picker --- .../com/sf/stormwaterutilityandroid/WaterWay/General.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java index 4c53de8..5c9e19c 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java @@ -85,7 +85,7 @@ private void setupForm() { List pipeTypeOptions = new ArrayList(); pipeTypeOptions.add("Enclosed Pipe"); pipeTypeOptions.add("Open Channel"); - FormElementPickerSingle typeValue = FormElementPickerSingle.createInstance().setTitle("Type").setOptions(pipeTypeOptions); + FormElementPickerMulti typeValue = FormElementPickerMulti.createInstance().setTitle("Type").setOptions(pipeTypeOptions); type = typeValue.getValue(); List pipeSizeOptions = new ArrayList(); @@ -100,7 +100,7 @@ private void setupForm() { pipeSizeOptions.add("20\""); pipeSizeOptions.add("24\""); pipeSizeOptions.add("36\""); - FormElementPickerSingle pipeSizeValue = FormElementPickerSingle.createInstance().setTitle("Pipe Size").setOptions(pipeSizeOptions); + FormElementPickerMulti pipeSizeValue = FormElementPickerMulti.createInstance().setTitle("Pipe Size").setOptions(pipeSizeOptions); pipeSize = pipeSizeValue.getValue(); List channelWidthOptions = new ArrayList Date: Sat, 27 Mar 2021 22:58:36 -0400 Subject: [PATCH 07/10] work in progress --- .../DryWeatherScreening.java | 8 ---- .../WaterWay/General.java | 38 +------------------ 2 files changed, 2 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java index 2bd9d01..9939364 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java @@ -44,14 +44,6 @@ public class DryWeatherScreening extends AppCompatActivity{ 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); - setContentView(R.layout.activity_sample_fordm); - recyclerView = findViewById(R.id.recyclerView2); - setupForm(); - } private void setupForm() { formBuilder = new FormBuilder(this, recyclerView); FormHeader title = (FormHeader) new FormHeader().setTitle("Dry Weather Screening"); diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java index 5c9e19c..7adc3cb 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java @@ -25,7 +25,7 @@ import me.riddhimanadib.formmaster.model.FormElementTextSingleLine; import me.riddhimanadib.formmaster.model.FormHeader; -public class General { +public class General extends AppCompatActivity{ //HQ form private FormBuilder formBuilder; private RecyclerView recyclerView; @@ -43,22 +43,8 @@ public class General { String pipeSize = ""; String channelBottomWidth = ""; String receivingWater = ""; - String routineEvaluation = ""; - String complaintInvestigation = ""; - - String comments = ""; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_sample_fordm); - recyclerView = findViewById(R.id.recyclerView2); - setupForm(); - } private void setupForm() { - formBuilder = new FormBuilder(this, recyclerView); - FormHeader title = (FormHeader) new FormHeader().setTitle("Report"); FormElementTextSingleLine name = FormElementTextSingleLine.createInstance().setTitle("Name of Inspector").setValue(""); @@ -103,7 +89,7 @@ private void setupForm() { FormElementPickerMulti pipeSizeValue = FormElementPickerMulti.createInstance().setTitle("Pipe Size").setOptions(pipeSizeOptions); pipeSize = pipeSizeValue.getValue(); - List channelWidthOptions = new ArrayList channelWidthOptions = new ArrayList(); channelWidthOptions.add("2\""); channelWidthOptions.add("4\""); channelWidthOptions.add("6\""); @@ -131,15 +117,6 @@ private void setupForm() { FormElementPickerMulti receiving = FormElementPickerMulti.createInstance().setTitle("Receiving Water").setOptions(receivingWaterOptions); receivingWater = receiving.getValue(); - /* - FormElementTextSingleLine routine = FormElementTextSingleLine.createInstance().setTitle("Routine Evaluation").setValue(""); - routineEvaluation = routine.getValue(); - - FormElementTextSingleLine complaint = FormElementTextSingleLine.createInstance().setTitle("Complaint Investigation").setValue(""); - complaintInvestigation = complaint.getValue(); - - FormElementTextSingleLine commentsValue = FormElementTextSingleLine.createInstance().setTitle("Comments").setValue(""); - comments = commentsValue.getValue();*/ } public String getName() { @@ -186,15 +163,4 @@ public String getReceivingWater() { return receivingWater; } - /*public String getRoutineEvaluation() { - return routineEvaluation; - } - - public String getComplaintInvestigation() { - return complaintInvestigation; - } - - public String getComments() { - return comments; - }*/ } From 6b8887081534c4fc3ea1976be4dfdea434c55b00 Mon Sep 17 00:00:00 2001 From: evanwilliams Date: Sat, 27 Mar 2021 23:01:06 -0400 Subject: [PATCH 08/10] fixed problems --- .../DryWeatherScreening.java | 27 ++++++++++++------- .../WaterWay/ChemicalTesting.java | 14 +++++----- .../WaterWay/General.java | 22 +++++++++++++++ 3 files changed, 46 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java index 9939364..68bf5dc 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java @@ -44,47 +44,56 @@ public class DryWeatherScreening extends AppCompatActivity{ boolean needMaintenance = false; boolean screenOK = false; + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setContentView(R.layout.activity_sample_fordm); + recyclerView = findViewById(R.id.recyclerView2); + setupForm(); + } + private void setupForm() { formBuilder = new FormBuilder(this, recyclerView); + List formItems = new ArrayList<>(); + FormHeader title = (FormHeader) new FormHeader().setTitle("Dry Weather Screening"); + formItems.add(title); FormElementSwitch flow = FormElementSwitch.createInstance().setTitle("Presence of Flow").setSwitchTexts("Yes", "No"); flowPres = convertToBoolean(flow.getValue()); + formItems.add(flow); FormElementSwitch odor = FormElementSwitch.createInstance().setTitle("Unusual Odor").setSwitchTexts("Yes", "No"); odorVal = odor.getValue(); odorPres = convertToBoolean(odorVal); + formItems.add(odor); FormElementSwitch color = FormElementSwitch.createInstance().setTitle("Unusual Color").setSwitchTexts("Yes", "No"); colorVal = color.getValue(); colorPres = convertToBoolean(colorVal); + formItems.add(color); FormElementSwitch polutants = FormElementSwitch.createInstance().setTitle("Polutants Nearby").setSwitchTexts("Yes", "No"); polutantsVal = polutants.getValue(); polutantsPres = convertToBoolean(polutantsVal); + formItems.add(polutants); FormElementSwitch obstruction = FormElementSwitch.createInstance().setTitle("Obstruction").setSwitchTexts("Yes", "No"); obstructionVal = obstruction.getValue(); obstructionPres = convertToBoolean(obstructionVal); + formItems.add(obstruction); FormElementSwitch maintenance = FormElementSwitch.createInstance().setTitle("Needs Maintenance").setSwitchTexts("Yes", "No"); maintenanceVal = maintenance.getValue(); needMaintenance = convertToBoolean(maintenanceVal); + formItems.add(maintenance); FormElementSwitch screen = FormElementSwitch.createInstance().setTitle("Screen OK").setSwitchTexts("Yes", "No"); screenVal = screen.getValue(); screenOK = convertToBoolean(screenVal); - - List formItems = new ArrayList<>(); - - formItems.add(flow); - formItems.add(odor); - formItems.add(color); - formItems.add(polutants); - formItems.add(obstruction); - formItems.add(maintenance); formItems.add(screen); + formBuilder.addFormElements(formItems); } diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java index 7befa77..6d25e79 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java @@ -1,10 +1,12 @@ -package com.sf.stormwaterutilityandroid; +package com.sf.stormwaterutilityandroid.WaterWay; import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.RecyclerView; +import com.sf.stormwaterutilityandroid.R; + import java.util.ArrayList; import java.util.List; @@ -37,17 +39,14 @@ public class ChemicalTesting extends AppCompatActivity{ double other1Val = 0.0; double other2Val = 0.0; - FormElementTextEmail element11; - @Override - //I assume onCreate is important so I will leave it unchanged - - protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setContentView(R.layout.activity_sample_fordm); - recyclerView = findViewById(R.id.recyclerView2); + recyclerView = findViewById(R.id.recyclerView2); setupForm(); } + private void setupForm() { formBuilder = new FormBuilder(this, recyclerView); @@ -56,7 +55,6 @@ private void setupForm() { //Outfall --> Question: How do you do a subheading? FormElementTextSingleLine temperature = new FormElementTextSingleLine().setTitle("Temperature (C) Change"); - //FormHeader temp = FormHeader.createInstance("Temperature (C) Change"); FormElementTextNumber tempData = FormElementTextNumber.createInstance(); //what data type is this? tempVal = Double.parseDouble(tempData.getValue()); diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java index 7adc3cb..f12516f 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java @@ -44,35 +44,54 @@ public class General extends AppCompatActivity{ String channelBottomWidth = ""; String receivingWater = ""; + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setContentView(R.layout.activity_sample_fordm); + recyclerView = findViewById(R.id.recyclerView2); + setupForm(); + } + private void setupForm() { + List formItems = new ArrayList<>(); + FormHeader title = (FormHeader) new FormHeader().setTitle("Report"); + formItems.add(title); FormElementTextSingleLine name = FormElementTextSingleLine.createInstance().setTitle("Name of Inspector").setValue(""); nameOfInspector = name.getValue(); + formItems.add(name); FormElementTextSingleLine site = FormElementTextSingleLine.createInstance().setTitle("Name of site").setValue(""); nameOfSite = site.getValue(); + formItems.add(site); FormElementPickerDate date = FormElementPickerDate.createInstance().setTitle("Date Row").setDateFormat("XX-XX-XXXX").setValue(""); dateRow = date.getValue(); + formItems.add(date); FormElementTextSingleLine outfallValue = FormElementTextSingleLine.createInstance().setTitle("Outfall").setValue("0"); outfall = Double.parseDouble(outfallValue.getValue()); + formItems.add(outfallValue); FormElementTextSingleLine longitudeValue = FormElementTextSingleLine.createInstance().setTitle("Longitude").setValue("0"); longitude = Double.parseDouble(longitudeValue.getValue()); + formItems.add(longitudeValue); FormElementTextSingleLine latitudeValue = FormElementTextSingleLine.createInstance().setTitle("Latitude").setValue("0"); latitude = Double.parseDouble(latitudeValue.getValue()); + formItems.add(latitudeValue); FormElementTextSingleLine invertElevationValue = FormElementTextSingleLine.createInstance().setTitle("Invert Elevation").setValue("0"); invertElevation = Double.parseDouble(invertElevationValue.getValue()); + formItems.add(invertElevationValue); List pipeTypeOptions = new ArrayList(); pipeTypeOptions.add("Enclosed Pipe"); pipeTypeOptions.add("Open Channel"); FormElementPickerMulti typeValue = FormElementPickerMulti.createInstance().setTitle("Type").setOptions(pipeTypeOptions); type = typeValue.getValue(); + formItems.add(typeValue); List pipeSizeOptions = new ArrayList(); pipeSizeOptions.add("4\""); @@ -88,6 +107,7 @@ private void setupForm() { pipeSizeOptions.add("36\""); FormElementPickerMulti pipeSizeValue = FormElementPickerMulti.createInstance().setTitle("Pipe Size").setOptions(pipeSizeOptions); pipeSize = pipeSizeValue.getValue(); + formItems.add(pipeSizeValue); List channelWidthOptions = new ArrayList(); channelWidthOptions.add("2\""); @@ -103,6 +123,7 @@ private void setupForm() { FormElementPickerMulti channelBottomWidthValue = FormElementPickerMulti.createInstance().setTitle("Channel Bottom Width") .setOptions(channelWidthOptions); channelBottomWidth = channelBottomWidthValue.getValue(); + formItems.add(channelBottomWidthValue); List receivingWaterOptions = new ArrayList(); receivingWaterOptions.add("Turkey Creek"); @@ -117,6 +138,7 @@ private void setupForm() { FormElementPickerMulti receiving = FormElementPickerMulti.createInstance().setTitle("Receiving Water").setOptions(receivingWaterOptions); receivingWater = receiving.getValue(); + formItems.add(receiving); } public String getName() { From 0c626270beb4b35a2dbb475171e819fc91c9c883 Mon Sep 17 00:00:00 2001 From: evanwilliams Date: Sat, 27 Mar 2021 23:07:11 -0400 Subject: [PATCH 09/10] fixed chemical form --- .../WaterWay/ChemicalTesting.java | 52 ++++++------------- 1 file changed, 17 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java index 6d25e79..adb5e8f 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java @@ -54,63 +54,45 @@ private void setupForm() { //Outfall --> Question: How do you do a subheading? - FormElementTextSingleLine temperature = new FormElementTextSingleLine().setTitle("Temperature (C) Change"); - FormElementTextNumber tempData = FormElementTextNumber.createInstance(); //what data type is this? - tempVal = Double.parseDouble(tempData.getValue()); + FormElementTextSingleLine temperature = new FormElementTextSingleLine().setTitle("Temperature (C) Change").setValue("0"); + tempVal = Double.parseDouble(temperature.getValue()); - FormElementTextSingleLine tubidity = new FormElementTextSingleLine().setTitle("Tubidity (NTU)"); - FormElementTextNumber tubidityData = FormElementTextNumber.createInstance(); - turbidityVal = Double.parseDouble(tubidityData.getValue()); + FormElementTextSingleLine tubidity = new FormElementTextSingleLine().setTitle("Tubidity (NTU)").setValue("0"); + turbidityVal = Double.parseDouble(tubidity.getValue()); - FormElementTextSingleLine pH = new FormElementTextSingleLine().setTitle("pH"); - FormElementTextNumber pHData = FormElementTextNumber.createInstance(); - phVal = Double.parseDouble(pHData.getValue()); + FormElementTextSingleLine pH = new FormElementTextSingleLine().setTitle("pH").setValue("0"); + phVal = Double.parseDouble(pH.getValue()); - FormElementTextSingleLine nitrate = new FormElementTextSingleLine().setTitle("Nitrate (mg/L)"); - FormElementTextNumber nitrateData = FormElementTextNumber.createInstance(); - nitrateVal = Double.parseDouble(nitrateData.getValue()); + FormElementTextSingleLine nitrate = new FormElementTextSingleLine().setTitle("Nitrate (mg/L)").setValue("0"); + nitrateVal = Double.parseDouble(nitrate.getValue()); - FormElementTextSingleLine phosphate = new FormElementTextSingleLine().setTitle("Total Phosphate (mg/L)"); - FormElementTextNumber phosphateData = FormElementTextNumber.createInstance(); - phosphateVal = Double.parseDouble(nitrateData.getValue()); + FormElementTextSingleLine phosphate = new FormElementTextSingleLine().setTitle("Total Phosphate (mg/L)").setValue("0"); + phosphateVal = Double.parseDouble(phosphate.getValue()); - FormElementTextSingleLine oxygen = new FormElementTextSingleLine().setTitle("Dissolved Oxygen (mg/L)"); - FormElementTextNumber oxygenData = FormElementTextNumber.createInstance(); - oxygenVal = Double.parseDouble(oxygenData.getValue()); + FormElementTextSingleLine oxygen = new FormElementTextSingleLine().setTitle("Dissolved Oxygen (mg/L)").setValue("0"); + oxygenVal = Double.parseDouble(oxygen.getValue()); - FormElementTextSingleLine coli = new FormElementTextSingleLine().setTitle("E Coli (col/100mL)"); - FormElementTextNumber coliData = FormElementTextNumber.createInstance(); - coliVal = Double.parseDouble(coliData.getValue()); + FormElementTextSingleLine coli = new FormElementTextSingleLine().setTitle("E Coli (col/100mL)").setValue("0"); + coliVal = Double.parseDouble(coli.getValue()); - FormElementTextSingleLine other1 = new FormElementTextSingleLine().setTitle("Other 1"); - FormElementTextNumber other1Data = FormElementTextNumber.createInstance(); - other1Val = Double.parseDouble(other1Data.getValue()); + FormElementTextSingleLine other1 = new FormElementTextSingleLine().setTitle("Other 1").setValue(""); + other1Val = Double.parseDouble(other1.getValue()); - FormElementTextSingleLine other2 = new FormElementTextSingleLine().setTitle("Other 2"); - FormElementTextNumber other2Data = FormElementTextNumber.createInstance(); + FormElementTextSingleLine other2 = new FormElementTextSingleLine().setTitle("Other 2").setValue(""); other2Val = Double.parseDouble(other2.getValue()); List formItems = new ArrayList<>(); formItems.add(title); formItems.add(temperature); - formItems.add(tempData); formItems.add(tubidity); - formItems.add(tubidityData); formItems.add(pH); - formItems.add(pHData); formItems.add(nitrate); - formItems.add(nitrateData); formItems.add(phosphate); - formItems.add(phosphateData); formItems.add(oxygen); - formItems.add(oxygenData); formItems.add(coli); - formItems.add(coliData); formItems.add(other1); - formItems.add(other1Data); formItems.add(other2); - formItems.add(other2Data); formBuilder.addFormElements(formItems); } From a7c03b95de30baebd2fdaf4c5ffa57a5f8a4a6d4 Mon Sep 17 00:00:00 2001 From: evanwilliams Date: Thu, 1 Apr 2021 16:08:44 -0400 Subject: [PATCH 10/10] copied form code into the form fragment --- .../WaterWay/WaterWayFormFragment.java | 238 +++++++++++++----- 1 file changed, 180 insertions(+), 58 deletions(-) diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java index a31a832..68aa3fe 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java @@ -22,6 +22,9 @@ import me.riddhimanadib.formmaster.FormBuilder; import me.riddhimanadib.formmaster.model.BaseFormElement; +import me.riddhimanadib.formmaster.model.FormElementPickerDate; +import me.riddhimanadib.formmaster.model.FormElementPickerMulti; +import me.riddhimanadib.formmaster.model.FormElementSwitch; import me.riddhimanadib.formmaster.model.FormElementTextNumber; import me.riddhimanadib.formmaster.model.FormElementTextSingleLine; import me.riddhimanadib.formmaster.model.FormHeader; @@ -142,9 +145,109 @@ public void onClick(View v) { } private void setupFormGen() { + String nameOfInspector = ""; + String nameOfSite = ""; + String dateRow = ""; + + double outfall = 0.0; + double longitude = 0.0; + double latitude = 0.0; + double invertElevation = 0.0; + + String type = ""; + String pipeSize = ""; + String channelBottomWidth = ""; + String receivingWater = ""; + boolgen = true; - - + fbGEn = new FormBuilder(getContext(), rvGen); + + List formItems = new ArrayList<>(); + + FormHeader title = (FormHeader) new FormHeader().setTitle("Report"); + formItems.add(title); + + FormElementTextSingleLine name = FormElementTextSingleLine.createInstance().setTitle("Name of Inspector").setValue(""); + nameOfInspector = name.getValue(); + formItems.add(name); + + FormElementTextSingleLine site = FormElementTextSingleLine.createInstance().setTitle("Name of site").setValue(""); + nameOfSite = site.getValue(); + formItems.add(site); + + FormElementPickerDate date = FormElementPickerDate.createInstance().setTitle("Date Row").setDateFormat("XX-XX-XXXX").setValue(""); + dateRow = date.getValue(); + formItems.add(date); + + FormElementTextSingleLine outfallValue = FormElementTextSingleLine.createInstance().setTitle("Outfall").setValue("0"); + outfall = Double.parseDouble(outfallValue.getValue()); + formItems.add(outfallValue); + + FormElementTextSingleLine longitudeValue = FormElementTextSingleLine.createInstance().setTitle("Longitude").setValue("0"); + longitude = Double.parseDouble(longitudeValue.getValue()); + formItems.add(longitudeValue); + + FormElementTextSingleLine latitudeValue = FormElementTextSingleLine.createInstance().setTitle("Latitude").setValue("0"); + latitude = Double.parseDouble(latitudeValue.getValue()); + formItems.add(latitudeValue); + + FormElementTextSingleLine invertElevationValue = FormElementTextSingleLine.createInstance().setTitle("Invert Elevation").setValue("0"); + invertElevation = Double.parseDouble(invertElevationValue.getValue()); + formItems.add(invertElevationValue); + + List pipeTypeOptions = new ArrayList(); + pipeTypeOptions.add("Enclosed Pipe"); + pipeTypeOptions.add("Open Channel"); + FormElementPickerMulti typeValue = FormElementPickerMulti.createInstance().setTitle("Type").setOptions(pipeTypeOptions); + type = typeValue.getValue(); + formItems.add(typeValue); + + List pipeSizeOptions = new ArrayList(); + pipeSizeOptions.add("4\""); + pipeSizeOptions.add("6\""); + pipeSizeOptions.add("8\""); + pipeSizeOptions.add("10\""); + pipeSizeOptions.add("12\""); + pipeSizeOptions.add("14\""); + pipeSizeOptions.add("16\""); + pipeSizeOptions.add("18\""); + pipeSizeOptions.add("20\""); + pipeSizeOptions.add("24\""); + pipeSizeOptions.add("36\""); + FormElementPickerMulti pipeSizeValue = FormElementPickerMulti.createInstance().setTitle("Pipe Size").setOptions(pipeSizeOptions); + pipeSize = pipeSizeValue.getValue(); + formItems.add(pipeSizeValue); + + List channelWidthOptions = new ArrayList(); + channelWidthOptions.add("2\""); + channelWidthOptions.add("4\""); + channelWidthOptions.add("6\""); + channelWidthOptions.add("8\""); + channelWidthOptions.add("10\""); + channelWidthOptions.add("12\""); + channelWidthOptions.add("14\""); + channelWidthOptions.add("16\""); + channelWidthOptions.add("18\""); + channelWidthOptions.add("20\""); + FormElementPickerMulti channelBottomWidthValue = FormElementPickerMulti.createInstance().setTitle("Channel Bottom Width") + .setOptions(channelWidthOptions); + channelBottomWidth = channelBottomWidthValue.getValue(); + formItems.add(channelBottomWidthValue); + + List receivingWaterOptions = new ArrayList(); + receivingWaterOptions.add("Turkey Creek"); + receivingWaterOptions.add("Deep River"); + receivingWaterOptions.add("Un-Named Tributary"); + receivingWaterOptions.add("Spring Run Ditch"); + receivingWaterOptions.add("Hart Ditch"); + receivingWaterOptions.add("Coffee Creek"); + receivingWaterOptions.add("Niles Ditch"); + receivingWaterOptions.add("Beaver Dam Ditch"); + receivingWaterOptions.add("Kaiser Ditch"); + + FormElementPickerMulti receiving = FormElementPickerMulti.createInstance().setTitle("Receiving Water").setOptions(receivingWaterOptions); + receivingWater = receiving.getValue(); + formItems.add(receiving); } private void setupFormHQ() { boolhq = true; @@ -168,7 +271,7 @@ private void setupFormHQ() { FormElementTextNumber element18 = FormElementTextNumber.createInstance().setTitle("Land Use").setValue("0"); FormElementTextNumber element19 = FormElementTextNumber.createInstance().setTitle("Bank Erosion").setValue("0"); - formItemsHQ = new ArrayList<>(); + formItemsHQ = new ArrayList<>(); formItemsHQ.add(element2); formItemsHQ.add(element3); @@ -192,49 +295,63 @@ private void setupFormHQ() { } private void setupFormDWS() { + String flowVal = ""; + String odorVal = ""; + String colorVal = ""; + String polutantsVal = ""; + String obstructionVal = ""; + String maintenanceVal = ""; + String screenVal = ""; + + boolean flowPres = false; + boolean odorPres = false; + boolean colorPres = false; + boolean polutantsPres = false; + boolean obstructionPres = false; + boolean needMaintenance = false; + boolean screenOK = false; + booldws = true; fbDWS = new FormBuilder(getContext(), rvDWS); + FormHeader title = (FormHeader) new FormHeader().setTitle("Dry Weather Screening"); - //Outfall --> Question: How do you do a subheading? - FormElementTextSingleLine flow = new FormElementTextSingleLine().setTitle("Presence of Flow"); - FormElementTextNumber flowData = FormElementTextNumber.createInstance(); //what data type is this? + FormElementSwitch flow = FormElementSwitch.createInstance().setTitle("Presence of Flow").setSwitchTexts("Yes", "No"); + flowPres = convertToBoolean(flow.getValue()); - FormElementTextSingleLine odor = new FormElementTextSingleLine().setTitle("Unusual Odor"); - FormElementTextNumber odorData = FormElementTextNumber.createInstance(); + FormElementSwitch odor = FormElementSwitch.createInstance().setTitle("Unusual Odor").setSwitchTexts("Yes", "No"); + odorVal = odor.getValue(); + odorPres = convertToBoolean(odorVal); - FormElementTextSingleLine color = new FormElementTextSingleLine().setTitle("Unusual Color"); - FormElementTextNumber colorData = FormElementTextNumber.createInstance(); + FormElementSwitch color = FormElementSwitch.createInstance().setTitle("Unusual Color").setSwitchTexts("Yes", "No"); + colorVal = color.getValue(); + colorPres = convertToBoolean(colorVal); - FormElementTextSingleLine polutants = new FormElementTextSingleLine().setTitle("Polutants Nearby"); - FormElementTextNumber polutantsData = FormElementTextNumber.createInstance(); - polutantsData.setTitle("Polutants Data"); + FormElementSwitch polutants = FormElementSwitch.createInstance().setTitle("Polutants Nearby").setSwitchTexts("Yes", "No"); + polutantsVal = polutants.getValue(); + polutantsPres = convertToBoolean(polutantsVal); - FormElementTextSingleLine obstruction = new FormElementTextSingleLine().setTitle("Obstruction"); - FormElementTextNumber obstructionData = FormElementTextNumber.createInstance(); + FormElementSwitch obstruction = FormElementSwitch.createInstance().setTitle("Obstruction").setSwitchTexts("Yes", "No"); + obstructionVal = obstruction.getValue(); + obstructionPres = convertToBoolean(obstructionVal); - FormElementTextSingleLine maintenance = new FormElementTextSingleLine().setTitle("Needs Maintenance"); - FormElementTextNumber maintenanceData = FormElementTextNumber.createInstance(); + FormElementSwitch maintenance = FormElementSwitch.createInstance().setTitle("Needs Maintenance").setSwitchTexts("Yes", "No"); + maintenanceVal = maintenance.getValue(); + needMaintenance = convertToBoolean(maintenanceVal); - FormElementTextSingleLine screen = new FormElementTextSingleLine().setTitle("Screen OK"); - FormElementTextNumber screenData = FormElementTextNumber.createInstance(); + FormElementSwitch screen = FormElementSwitch.createInstance().setTitle("Screen OK").setSwitchTexts("Yes", "No"); + screenVal = screen.getValue(); + screenOK = convertToBoolean(screenVal); formItemsDWS = new ArrayList<>(); formItemsDWS.add(flow); - formItemsDWS.add(flowData); formItemsDWS.add(odor); - formItemsDWS.add(odorData); formItemsDWS.add(color); - formItemsDWS.add(colorData); formItemsDWS.add(polutants); - formItemsDWS.add(polutantsData); formItemsDWS.add(obstruction); - formItemsDWS.add(obstructionData); formItemsDWS.add(maintenance); - formItemsDWS.add(maintenanceData); formItemsDWS.add(screen); - formItemsDWS.add(screenData); fbDWS.addFormElements(formItemsDWS); } @@ -242,59 +359,56 @@ private void setupFormCT() { boolct = true; fbCT = new FormBuilder(getContext(), rvCT); - FormHeader title = (FormHeader) new FormHeader().setTitle("Chemical Testing"); + double tempVal = 0.0; + double turbidityVal = 0.0; + double phVal = 0.0; + double nitrateVal = 0.0; + double phosphateVal = 0.0; + double oxygenVal = 0.0; + double coliVal = 0.0; + double other1Val = 0.0; + double other2Val = 0.0; - //Outfall --> Question: How do you do a subheading? - - FormElementTextSingleLine temperature = new FormElementTextSingleLine().setTitle("Temperature (C) Change"); - //FormHeader temp = FormHeader.createInstance("Temperature (C) Change"); - FormElementTextNumber tempData = FormElementTextNumber.createInstance(); //what data type is this? + FormHeader title = (FormHeader) new FormHeader().setTitle("Chemical Testing"); - FormElementTextSingleLine tubidity = new FormElementTextSingleLine().setTitle("Tubidity (NTU)"); - FormElementTextNumber tubidityData = FormElementTextNumber.createInstance(); + FormElementTextSingleLine temperature = new FormElementTextSingleLine().setTitle("Temperature (C) Change").setValue("0"); + tempVal = Double.parseDouble(temperature.getValue()); - FormElementTextSingleLine pH = new FormElementTextSingleLine().setTitle("pH"); - FormElementTextNumber pHData = FormElementTextNumber.createInstance(); + FormElementTextSingleLine tubidity = new FormElementTextSingleLine().setTitle("Tubidity (NTU)").setValue("0"); + turbidityVal = Double.parseDouble(tubidity.getValue()); - FormElementTextSingleLine nitrate = new FormElementTextSingleLine().setTitle("Nitrate (mg/L)"); - FormElementTextNumber nitrateData = FormElementTextNumber.createInstance(); + FormElementTextSingleLine pH = new FormElementTextSingleLine().setTitle("pH").setValue("0"); + phVal = Double.parseDouble(pH.getValue()); - FormElementTextSingleLine phosphate = new FormElementTextSingleLine().setTitle("Total Phosphate (mg/L)"); - FormElementTextNumber phosphateData = FormElementTextNumber.createInstance(); + FormElementTextSingleLine nitrate = new FormElementTextSingleLine().setTitle("Nitrate (mg/L)").setValue("0"); + nitrateVal = Double.parseDouble(nitrate.getValue()); - FormElementTextSingleLine oxygen = new FormElementTextSingleLine().setTitle("Dissolved Oxygen (mg/L)"); - FormElementTextNumber oxygenData = FormElementTextNumber.createInstance(); + FormElementTextSingleLine phosphate = new FormElementTextSingleLine().setTitle("Total Phosphate (mg/L)").setValue("0"); + phosphateVal = Double.parseDouble(phosphate.getValue()); - FormElementTextSingleLine coli = new FormElementTextSingleLine().setTitle("E Coli (col/100mL)"); - FormElementTextNumber coliData = FormElementTextNumber.createInstance(); + FormElementTextSingleLine oxygen = new FormElementTextSingleLine().setTitle("Dissolved Oxygen (mg/L)").setValue("0"); + oxygenVal = Double.parseDouble(oxygen.getValue()); - FormElementTextSingleLine other1 = new FormElementTextSingleLine().setTitle("Other 1"); - FormElementTextNumber other1Data = FormElementTextNumber.createInstance(); + FormElementTextSingleLine coli = new FormElementTextSingleLine().setTitle("E Coli (col/100mL)").setValue("0"); + coliVal = Double.parseDouble(coli.getValue()); - FormElementTextSingleLine other2 = new FormElementTextSingleLine().setTitle("Other 2"); - FormElementTextNumber other2Data = FormElementTextNumber.createInstance(); + FormElementTextSingleLine other1 = new FormElementTextSingleLine().setTitle("Other 1").setValue(""); + other1Val = Double.parseDouble(other1.getValue()); - formItemsCT = new ArrayList<>(); + FormElementTextSingleLine other2 = new FormElementTextSingleLine().setTitle("Other 2").setValue(""); + other2Val = Double.parseDouble(other2.getValue()); + formItemsCT = new ArrayList<>(); formItemsCT.add(title); formItemsCT.add(temperature); - formItemsCT.add(tempData); formItemsCT.add(tubidity); - formItemsCT.add(tubidityData); formItemsCT.add(pH); - formItemsCT.add(pHData); formItemsCT.add(nitrate); - formItemsCT.add(nitrateData); formItemsCT.add(phosphate); - formItemsCT.add(phosphateData); formItemsCT.add(oxygen); - formItemsCT.add(oxygenData); formItemsCT.add(coli); - formItemsCT.add(coliData); formItemsCT.add(other1); - formItemsCT.add(other1Data); formItemsCT.add(other2); - formItemsCT.add(other2Data); fbCT.addFormElements(formItemsCT); @@ -303,4 +417,12 @@ private void setupFormBM() { boolbm = true; } + + public boolean convertToBoolean(String s) { + if (s.compareTo("Yes") == 0) { + return true; + } else { + return false; + } + } } \ No newline at end of file