From bb28e54f5383dfac0d9fc307309dc3bd7b605c84 Mon Sep 17 00:00:00 2001 From: evanwilliams Date: Thu, 25 Mar 2021 20:48:44 -0400 Subject: [PATCH 01/18] 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/18] 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/18] 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/18] 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/18] 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/18] 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/18] 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/18] 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/18] 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/18] 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 From 6dfc62dd9a3de2d20daea9b885f63de1c0fd7623 Mon Sep 17 00:00:00 2001 From: evanwilliams Date: Thu, 1 Apr 2021 17:00:27 -0400 Subject: [PATCH 11/18] fixed bugs in the forms --- .../WaterWay/WaterWayFormFragment.java | 76 ++++++++++--------- 1 file changed, 39 insertions(+), 37 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 68aa3fe..19564e1 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java @@ -161,46 +161,45 @@ private void setupFormGen() { boolgen = true; fbGEn = new FormBuilder(getContext(), rvGen); - - List formItems = new ArrayList<>(); + formItemsGen = new ArrayList<>(); FormHeader title = (FormHeader) new FormHeader().setTitle("Report"); - formItems.add(title); + formItemsGen.add(title); FormElementTextSingleLine name = FormElementTextSingleLine.createInstance().setTitle("Name of Inspector").setValue(""); nameOfInspector = name.getValue(); - formItems.add(name); + formItemsGen.add(name); FormElementTextSingleLine site = FormElementTextSingleLine.createInstance().setTitle("Name of site").setValue(""); nameOfSite = site.getValue(); - formItems.add(site); + formItemsGen.add(site); - FormElementPickerDate date = FormElementPickerDate.createInstance().setTitle("Date Row").setDateFormat("XX-XX-XXXX").setValue(""); + FormElementPickerDate date = FormElementPickerDate.createInstance().setTitle("Date Row").setDateFormat("dd/MM/yyyy").setValue(""); dateRow = date.getValue(); - formItems.add(date); + formItemsGen.add(date); FormElementTextSingleLine outfallValue = FormElementTextSingleLine.createInstance().setTitle("Outfall").setValue("0"); outfall = Double.parseDouble(outfallValue.getValue()); - formItems.add(outfallValue); + formItemsGen.add(outfallValue); FormElementTextSingleLine longitudeValue = FormElementTextSingleLine.createInstance().setTitle("Longitude").setValue("0"); longitude = Double.parseDouble(longitudeValue.getValue()); - formItems.add(longitudeValue); + formItemsGen.add(longitudeValue); FormElementTextSingleLine latitudeValue = FormElementTextSingleLine.createInstance().setTitle("Latitude").setValue("0"); latitude = Double.parseDouble(latitudeValue.getValue()); - formItems.add(latitudeValue); + formItemsGen.add(latitudeValue); FormElementTextSingleLine invertElevationValue = FormElementTextSingleLine.createInstance().setTitle("Invert Elevation").setValue("0"); invertElevation = Double.parseDouble(invertElevationValue.getValue()); - formItems.add(invertElevationValue); + formItemsGen.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); + formItemsGen.add(typeValue); List pipeSizeOptions = new ArrayList(); pipeSizeOptions.add("4\""); @@ -216,7 +215,7 @@ private void setupFormGen() { pipeSizeOptions.add("36\""); FormElementPickerMulti pipeSizeValue = FormElementPickerMulti.createInstance().setTitle("Pipe Size").setOptions(pipeSizeOptions); pipeSize = pipeSizeValue.getValue(); - formItems.add(pipeSizeValue); + formItemsGen.add(pipeSizeValue); List channelWidthOptions = new ArrayList(); channelWidthOptions.add("2\""); @@ -232,7 +231,7 @@ private void setupFormGen() { FormElementPickerMulti channelBottomWidthValue = FormElementPickerMulti.createInstance().setTitle("Channel Bottom Width") .setOptions(channelWidthOptions); channelBottomWidth = channelBottomWidthValue.getValue(); - formItems.add(channelBottomWidthValue); + formItemsGen.add(channelBottomWidthValue); List receivingWaterOptions = new ArrayList(); receivingWaterOptions.add("Turkey Creek"); @@ -247,7 +246,9 @@ private void setupFormGen() { FormElementPickerMulti receiving = FormElementPickerMulti.createInstance().setTitle("Receiving Water").setOptions(receivingWaterOptions); receivingWater = receiving.getValue(); - formItems.add(receiving); + formItemsGen.add(receiving); + + fbGEn.addFormElements(formItemsGen); } private void setupFormHQ() { boolhq = true; @@ -345,6 +346,7 @@ private void setupFormDWS() { formItemsDWS = new ArrayList<>(); + formItemsDWS.add(title); formItemsDWS.add(flow); formItemsDWS.add(odor); formItemsDWS.add(color); @@ -355,48 +357,50 @@ private void setupFormDWS() { fbDWS.addFormElements(formItemsDWS); } + private void setupFormCT() { boolct = true; fbCT = new FormBuilder(getContext(), rvCT); - 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; + double tempVal = 0; + double turbidityVal = 0; + double phVal = 0; + double nitrateVal = 0; + double phosphateVal = 0; + double oxygenVal = 0; + double coliVal = 0; + String other1Val = ""; + String other2Val = ""; FormHeader title = (FormHeader) new FormHeader().setTitle("Chemical Testing"); - FormElementTextSingleLine temperature = new FormElementTextSingleLine().setTitle("Temperature (C) Change").setValue("0"); + FormElementTextNumber temperature = new FormElementTextNumber().createInstance().setTitle("Temperature (C) Change").setValue("0"); tempVal = Double.parseDouble(temperature.getValue()); - FormElementTextSingleLine tubidity = new FormElementTextSingleLine().setTitle("Tubidity (NTU)").setValue("0"); + FormElementTextNumber tubidity = new FormElementTextNumber().createInstance().setTitle("Tubidity (NTU)").setValue("0"); turbidityVal = Double.parseDouble(tubidity.getValue()); - FormElementTextSingleLine pH = new FormElementTextSingleLine().setTitle("pH").setValue("0"); + FormElementTextNumber pH = new FormElementTextNumber().createInstance().setTitle("pH").setValue("0"); phVal = Double.parseDouble(pH.getValue()); - FormElementTextSingleLine nitrate = new FormElementTextSingleLine().setTitle("Nitrate (mg/L)").setValue("0"); + FormElementTextNumber nitrate = new FormElementTextNumber().createInstance().setTitle("Nitrate (mg/L)").setValue("0"); nitrateVal = Double.parseDouble(nitrate.getValue()); - FormElementTextSingleLine phosphate = new FormElementTextSingleLine().setTitle("Total Phosphate (mg/L)").setValue("0"); + FormElementTextNumber phosphate = new FormElementTextNumber().createInstance().setTitle("Total Phosphate (mg/L)").setValue("0"); phosphateVal = Double.parseDouble(phosphate.getValue()); - FormElementTextSingleLine oxygen = new FormElementTextSingleLine().setTitle("Dissolved Oxygen (mg/L)").setValue("0"); + FormElementTextNumber oxygen = new FormElementTextNumber().createInstance().setTitle("Dissolved Oxygen (mg/L)").setValue("0"); oxygenVal = Double.parseDouble(oxygen.getValue()); - FormElementTextSingleLine coli = new FormElementTextSingleLine().setTitle("E Coli (col/100mL)").setValue("0"); + FormElementTextNumber coli = new FormElementTextNumber().createInstance().setTitle("E Coli (col/100mL)").setValue("0"); coliVal = Double.parseDouble(coli.getValue()); - FormElementTextSingleLine other1 = new FormElementTextSingleLine().setTitle("Other 1").setValue(""); - other1Val = Double.parseDouble(other1.getValue()); + FormElementTextSingleLine other1 = new FormElementTextSingleLine().createInstance().setTitle("Other 1").setValue(""); + other1Val = other1.getValue(); + + FormElementTextSingleLine other2 = new FormElementTextSingleLine().createInstance().setTitle("Other 2").setValue(""); + other2Val = other2.getValue(); - FormElementTextSingleLine other2 = new FormElementTextSingleLine().setTitle("Other 2").setValue(""); - other2Val = Double.parseDouble(other2.getValue()); formItemsCT = new ArrayList<>(); formItemsCT.add(title); @@ -411,11 +415,9 @@ private void setupFormCT() { formItemsCT.add(other2); fbCT.addFormElements(formItemsCT); - } private void setupFormBM() { boolbm = true; - } public boolean convertToBoolean(String s) { From b7441becc5b16d760f57cdc172273030fa1e97b1 Mon Sep 17 00:00:00 2001 From: John Parrell Date: Wed, 7 Apr 2021 17:35:29 -0400 Subject: [PATCH 12/18] Added picker elements to form --- .../WaterWay/WaterWayForm.java | 38 +++++++++++++++---- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java index 8ceee50..5bf908e 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java @@ -14,7 +14,18 @@ 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 WaterWayForm extends AppCompatActivity { //HQ form @@ -48,17 +59,23 @@ public class WaterWayForm extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_sample_fordm); recyclerView = findViewById(R.id.recyclerView2); - setupHQForm(); - + setupForm(); } - private void setupHQForm() { + private void setupForm() { formBuilder = new FormBuilder(this, recyclerView); - FormElementTextNumber subSize = FormElementTextNumber.createInstance().setTitle("Substrate Size").setValue("0"); + List array_subSize = new ArrayList<>(); + array_subSize.add("14: Large(4\" or larger)"); + array_subSize.add("10: Medium(1\" to 4\")"); + array_subSize.add("6: Small(.25\" to 1\")"); + + array_subSize.add("0: Fine(granular)"); + + + FormElementPickerSingle subSize = FormElementPickerSingle.createInstance().setTitle("Substrate Size").setOptions(array_subSize).setPickerTitle("Pick one option"); FormElementTextNumber smothering = FormElementTextNumber.createInstance().setTitle("Smothering").setValue("0"); FormElementTextNumber silting = FormElementTextNumber.createInstance().setTitle("Silting").setValue("0"); FormElementTextNumber rootwads = FormElementTextNumber.createInstance().setTitle("Rootwads").setValue("0"); @@ -99,9 +116,16 @@ private void setupHQForm() { formItems.add(bankErosion); formBuilder.addFormElements(formItems); + int index = subSize.getValue().indexOf(":"); + if (index > 0) + { + subVal = Double.parseDouble(subSize.getValue().substring(0,index)); + } + else + { + subVal = 0; + } - - subVal = Double.parseDouble(subSize.getValue()); smothVal = Double.parseDouble(smothering.getValue()); siltVal = Double.parseDouble(silting.getValue()); rootVal = Double.parseDouble(rootwads.getValue()); From e30ecc1c9cf2f0678493667f49899214ddf6da32 Mon Sep 17 00:00:00 2001 From: John Parrell Date: Wed, 7 Apr 2021 18:38:59 -0400 Subject: [PATCH 13/18] Added retrieval and updated all pciker elements to WaterWayForm --- .../WaterWay/WaterWayForm.java | 125 ++++++++++++------ 1 file changed, 83 insertions(+), 42 deletions(-) diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java index 5bf908e..4470cf1 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java @@ -71,28 +71,64 @@ private void setupForm() { array_subSize.add("14: Large(4\" or larger)"); array_subSize.add("10: Medium(1\" to 4\")"); array_subSize.add("6: Small(.25\" to 1\")"); - array_subSize.add("0: Fine(granular)"); - FormElementPickerSingle subSize = FormElementPickerSingle.createInstance().setTitle("Substrate Size").setOptions(array_subSize).setPickerTitle("Pick one option"); - FormElementTextNumber smothering = FormElementTextNumber.createInstance().setTitle("Smothering").setValue("0"); - FormElementTextNumber silting = FormElementTextNumber.createInstance().setTitle("Silting").setValue("0"); - FormElementTextNumber rootwads = FormElementTextNumber.createInstance().setTitle("Rootwads").setValue("0"); - FormElementTextNumber overhangingVeg = FormElementTextNumber.createInstance().setTitle("Overhanging Veg.").setValue("0"); - FormElementTextNumber oxbows = FormElementTextNumber.createInstance().setTitle("Oxbows/Black Waters").setValue("0"); - FormElementTextNumber downed = FormElementTextNumber.createInstance().setTitle("Downed Trees/Logs").setValue("0"); - FormElementTextNumber shallows = FormElementTextNumber.createInstance().setTitle("Shallows (slow water)").setValue("0"); - FormElementTextNumber waterPlants = FormElementTextNumber.createInstance().setTitle("Water Plants").setValue("0"); - FormElementTextNumber deepPools = FormElementTextNumber.createInstance().setTitle("Deep Pools").setValue("0"); - FormElementTextNumber logs = FormElementTextNumber.createInstance().setTitle("Logs/Woody Debris").setValue("0"); - FormElementTextNumber boulders = FormElementTextNumber.createInstance().setTitle("Boulders").setValue("0"); - FormElementTextNumber undercutBanks = FormElementTextNumber.createInstance().setTitle("Undercut Banks").setValue("0"); - FormElementTextNumber sinuosity = FormElementTextNumber.createInstance().setTitle("Sinuosity").setValue("0"); - FormElementTextNumber natural = FormElementTextNumber.createInstance().setTitle("Natural").setValue("0"); - FormElementTextNumber riparianWidth = FormElementTextNumber.createInstance().setTitle("Riparian Width").setValue("0"); - FormElementTextNumber landUse = FormElementTextNumber.createInstance().setTitle("Land Use").setValue("0"); - FormElementTextNumber bankErosion = FormElementTextNumber.createInstance().setTitle("Bank Erosion").setValue("0"); + List array_yesNo5 = new ArrayList<>(); + array_yesNo5.add("0: Yes"); + array_yesNo5.add("5: No"); + + List array_yesNo2 = new ArrayList<>(); + array_yesNo2.add("2: Yes"); + array_yesNo2.add("0: No"); + + List array_sinuosity = new ArrayList<>(); + array_sinuosity.add("8: Two or more bends"); + array_sinuosity.add("3: Less than two bends"); + + List array_natural = new ArrayList<>(); + array_natural.add("12: Mostly Natural"); + array_natural.add("9: Minor Man-made impacts"); + array_natural.add("6: Many Man-made changes"); + array_natural.add("0: Completely Manipulated"); + + List array_riparian = new ArrayList<>(); + array_riparian.add("8: Wide (20' or more)"); + array_riparian.add("5: Narrow (Less than 20')"); + array_riparian.add("0: None"); + + List array_landUse = new ArrayList<>(); + array_landUse.add("5: Forest/Wetland"); + array_landUse.add("4: Shrub"); + array_landUse.add("3: Overgrown Fields"); + array_landUse.add("2: Fenced Pasture"); + array_landUse.add("2: Parkland/Grass"); + array_landUse.add("2: Conservation Tillage"); + array_landUse.add("1: Row Crop"); + array_landUse.add("0: Open Pasture"); + array_landUse.add("0: Urban/Industrial"); + + List array_bankErosion = new ArrayList<>(); + array_bankErosion.add("4: None/Little"); + array_bankErosion.add("2: Moderate"); + array_bankErosion.add("0: Heavy/Severe"); + FormElementPickerSingle smothering = FormElementPickerSingle.createInstance().setTitle("Smothering").setOptions(array_yesNo5).setPickerTitle("Pick one option"); + FormElementPickerSingle silting = FormElementPickerSingle.createInstance().setTitle("Silting").setOptions(array_yesNo5).setPickerTitle("Pick one option"); + FormElementPickerSingle rootwads = FormElementPickerSingle.createInstance().setTitle("Rootwads").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle overhangingVeg = FormElementPickerSingle.createInstance().setTitle("Overhanging Veg.").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle oxbows = FormElementPickerSingle.createInstance().setTitle("Oxbows/Black Waters").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle downed = FormElementPickerSingle.createInstance().setTitle("Downed Trees/Logs").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle shallows = FormElementPickerSingle.createInstance().setTitle("Shallows (slow water)").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle waterPlants = FormElementPickerSingle.createInstance().setTitle("Water Plants").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle deepPools = FormElementPickerSingle.createInstance().setTitle("Deep Pools").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle logs = FormElementPickerSingle.createInstance().setTitle("Logs/Woody Debris").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle boulders = FormElementPickerSingle.createInstance().setTitle("Boulders").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle undercutBanks = FormElementPickerSingle.createInstance().setTitle("Undercut Banks").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle sinuosity = FormElementPickerSingle.createInstance().setTitle("Sinuosity").setOptions(array_sinuosity).setPickerTitle("Pick one option"); + FormElementPickerSingle natural = FormElementPickerSingle.createInstance().setTitle("Natural").setOptions(array_natural).setPickerTitle("Pick one option"); + FormElementPickerSingle riparianWidth = FormElementPickerSingle.createInstance().setTitle("Riparian Width").setOptions(array_riparian).setPickerTitle("Pick one option"); + FormElementPickerSingle landUse = FormElementPickerSingle.createInstance().setTitle("Land Use").setOptions(array_landUse).setPickerTitle("Pick one option"); + FormElementPickerSingle bankErosion = FormElementPickerSingle.createInstance().setTitle("Bank Erosion").setOptions(array_bankErosion).setPickerTitle("Pick one option"); List formItems = new ArrayList<>(); @@ -116,35 +152,40 @@ private void setupForm() { formItems.add(bankErosion); formBuilder.addFormElements(formItems); - int index = subSize.getValue().indexOf(":"); + subVal = pickerValue(subSize); + + smothVal = pickerValue(smothering); + siltVal = pickerValue(silting); + rootVal = pickerValue(rootwads); + overVegVal = pickerValue(overhangingVeg); + oxVal = pickerValue(oxbows); + downVal = pickerValue(downed); + shallowVal = pickerValue(shallows); + watVal = pickerValue(waterPlants); + deepVal = pickerValue(deepPools); + logVal = pickerValue(logs); + bouldVal = pickerValue(boulders); + underVal = pickerValue(undercutBanks); + sinVal = pickerValue(sinuosity); + natVal = pickerValue(natural); + ripVal = pickerValue(riparianWidth); + landVal = pickerValue(landUse); + bankVal = pickerValue(bankErosion); + + + } + private double pickerValue(FormElementPickerSingle var){ + int index = var.getValue().indexOf(":"); + double pickerOption; if (index > 0) { - subVal = Double.parseDouble(subSize.getValue().substring(0,index)); + pickerOption = Double.parseDouble(var.getValue().substring(0,index)); } else { - subVal = 0; + pickerOption = 0; } - - smothVal = Double.parseDouble(smothering.getValue()); - siltVal = Double.parseDouble(silting.getValue()); - rootVal = Double.parseDouble(rootwads.getValue()); - overVegVal = Double.parseDouble(overhangingVeg.getValue()); - oxVal = Double.parseDouble(oxbows.getValue()); - downVal = Double.parseDouble(downed.getValue()); - shallowVal = Double.parseDouble(shallows.getValue()); - watVal = Double.parseDouble(waterPlants.getValue()); - deepVal = Double.parseDouble(deepPools.getValue()); - logVal = Double.parseDouble(logs.getValue()); - bouldVal = Double.parseDouble(boulders.getValue()); - underVal = Double.parseDouble(undercutBanks.getValue()); - sinVal = Double.parseDouble(sinuosity.getValue()); - natVal = Double.parseDouble(natural.getValue()); - ripVal = Double.parseDouble(riparianWidth.getValue()); - landVal = Double.parseDouble(landUse.getValue()); - bankVal = Double.parseDouble(bankErosion.getValue()); - - + return(pickerOption); } private void setupTolerantForm(){ formBuilder = new FormBuilder(this, recyclerView); From d943741b37ee4887260c103845b8c038c39c3c7f Mon Sep 17 00:00:00 2001 From: John Parrell Date: Thu, 8 Apr 2021 17:19:12 -0400 Subject: [PATCH 14/18] Added map and completed form to WaterWayFormFragment --- .../WaterWay/WaterWayForm.java | 1 + .../WaterWay/WaterWayFormFragment.java | 370 ++++++++++++++---- 2 files changed, 293 insertions(+), 78 deletions(-) diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java index 4470cf1..08cad4f 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java @@ -112,6 +112,7 @@ private void setupForm() { array_bankErosion.add("4: None/Little"); array_bankErosion.add("2: Moderate"); array_bankErosion.add("0: Heavy/Severe"); + FormElementPickerSingle smothering = FormElementPickerSingle.createInstance().setTitle("Smothering").setOptions(array_yesNo5).setPickerTitle("Pick one option"); FormElementPickerSingle silting = FormElementPickerSingle.createInstance().setTitle("Silting").setOptions(array_yesNo5).setPickerTitle("Pick one option"); FormElementPickerSingle rootwads = FormElementPickerSingle.createInstance().setTitle("Rootwads").setOptions(array_yesNo2).setPickerTitle("Pick one option"); 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 19564e1..277e413 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java @@ -18,12 +18,15 @@ import com.sf.stormwaterutilityandroid.SampleFordm; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; 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.FormElementSwitch; import me.riddhimanadib.formmaster.model.FormElementTextNumber; import me.riddhimanadib.formmaster.model.FormElementTextSingleLine; @@ -31,6 +34,84 @@ public class WaterWayFormFragment extends Fragment { + //Gen Form Variable Initialization + 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 = ""; + + //DWS Form Variable Initialization + 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; + //CT Form Variable Initialization + double tempVal = 0; + double turbidityVal = 0; + double phVal = 0; + double nitrateVal = 0; + double phosphateVal = 0; + double oxygenVal = 0; + double coliVal = 0; + String other1Val = ""; + String other2Val = ""; + + //HQ Form Variable Initialization + String sub = ""; + String smoth = ""; + String silt = ""; + String rootString = ""; + String overVeg = ""; + String ox = ""; + String down = ""; + String shallow = ""; + String wat = ""; + String deep = ""; + String log = ""; + String bould = ""; + String under = ""; + String sin = ""; + String nat = ""; + String rip = ""; + String land = ""; + String bank = ""; + boolean screenOK = false; + double subVal = 0.0; + double smothVal = 0.0; + double siltVal = 0.0; + double rootVal = 0.0; + double overVegVal = 0.0; + double oxVal = 0.0; + double downVal = 0.0; + double shallowVal = 0.0; + double watVal = 0.0; + double deepVal = 0.0; + double logVal = 0.0; + double bouldVal = 0.0; + double underVal = 0.0; + double sinVal = 0.0; + double natVal = 0.0; + double ripVal = 0.0; + double landVal = 0.0; + double bankVal = 0.0; RecyclerView rvGen, rvDWS, rvHQ, rvBM,rvCT; FormBuilder fbGEn,fbDWS,fbBM,fbHQ,fbCT; SegmentedButton gen,dws,ct,bm,hq; @@ -84,8 +165,82 @@ public void onClick(View v) { submit.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - + Map WaterWayDoubleFields = new HashMap(); + Map WaterWayBoolFields = new HashMap(); + Map WaterWayStringFields = new HashMap(); + + //Water Quality Index Data + WaterWayDoubleFields.put("CT_temperature_change",tempVal ); + WaterWayDoubleFields.put("CT_turbidity", turbidityVal); + WaterWayDoubleFields.put("CT_pH", phVal); + WaterWayDoubleFields.put("CT_nitrate", nitrateVal); + WaterWayDoubleFields.put("CT_total_phosphate", phosphateVal); + WaterWayDoubleFields.put("CT_dissolved_oxygen", oxygenVal); + //PTI Data + WaterWayDoubleFields.put("BM_intolerant", new Double(0.0)); + WaterWayDoubleFields.put("BM_moderately_tolerant", new Double(0.0)); + WaterWayDoubleFields.put("BM_fairly_tolerant", new Double(0.0)); + WaterWayDoubleFields.put("BM_very_tolerant", new Double(0.0)); + + WaterWayDoubleFields.put("WQI", new Double(0.0)); + WaterWayDoubleFields.put("HEI", new Double(0.0)); + WaterWayDoubleFields.put("PTI", new Double(0.0)); + + //Boolean Fields + WaterWayBoolFields.put("DWS_needs_maintenance", needMaintenance); + WaterWayBoolFields.put("DWS_obstruction", obstructionPres); + WaterWayBoolFields.put("DWS_polutants", polutantsPres); + WaterWayBoolFields.put("DWS_presence_of_flow", flowPres); + WaterWayBoolFields.put("DWS_screened_OK", screenOK); + WaterWayBoolFields.put("DWS_unusual_color", colorPres); + WaterWayBoolFields.put("DWS_unusual_odor", odorPres); + WaterWayBoolFields.put("FC_complaint_investigation", new Boolean(false)); + WaterWayBoolFields.put("FC_further_action_needed", new Boolean(false)); + WaterWayBoolFields.put("FC_illicit_discharge_detected", new Boolean(false)); + WaterWayBoolFields.put("FC_no_illicit_discharge_detected", new Boolean(false)); + WaterWayBoolFields.put("FC_routine_evaluation", new Boolean(false)); + + //String Fields +//HEI Data + WaterWayStringFields.put("QHEI_substrate_size", sub ); + WaterWayStringFields.put("QHEI_smothering", smoth); + WaterWayStringFields.put("QHEI_silting", silt); + WaterWayStringFields.put("QHEI_rootwads", rootString); + WaterWayStringFields.put("QHEI_overhanging_veg", overVeg); + WaterWayStringFields.put("QHEI_oxbowsblack_waters", ox ); + WaterWayStringFields.put("QHEI_downed_treeslogs",down); + WaterWayStringFields.put("QHEI_shallows", shallow); + WaterWayStringFields.put("QHEI_water_plants", wat); + WaterWayStringFields.put("QHEI_deep_pools", deep); + WaterWayStringFields.put("QHEI_logswoody_debris", log); + WaterWayStringFields.put("QHEI_boulders", bould); + WaterWayStringFields.put("QHEI_undercut_banks", under); + WaterWayStringFields.put("QHEI_sinuosity", sin); + WaterWayStringFields.put("QHEI_riparian_width", rip); + WaterWayStringFields.put("QHEI_land_use", land); + WaterWayStringFields.put("QHEI_bank_erosion", bank); + WaterWayStringFields.put("QHEI_stream_shading", ""); + WaterWayStringFields.put("QHEI_deepest_pool", ""); + WaterWayStringFields.put("QHEI_velocity", ""); + WaterWayStringFields.put("QHEI_rifflerun_depth", ""); + WaterWayStringFields.put("QHEI_rifflerun_substrate", ""); + + WaterWayStringFields.put("GOD_channel_bottom_width", ""); + WaterWayStringFields.put("GOD_invert_elevation", ""); + WaterWayStringFields.put("GOD_latitude", ""); + WaterWayStringFields.put("GOD_longitude", ""); + WaterWayStringFields.put("GOD_outfall", ""); + WaterWayStringFields.put("GOD_pipe_size", ""); + WaterWayStringFields.put("GOD_receiving_water", ""); + WaterWayStringFields.put("GOD_type", ""); + + //Comments + WaterWayStringFields.put("CS_comments", ""); + WaterWayStringFields.put("CT_other_1", ""); + WaterWayStringFields.put("CT_other_2", ""); } + + }); dws.setOnClickListener(new View.OnClickListener() { @Override @@ -145,19 +300,6 @@ 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); @@ -253,64 +395,145 @@ private void setupFormGen() { private void setupFormHQ() { boolhq = true; fbHQ = new FormBuilder(getContext(),rvHQ); - FormElementTextNumber element2 = FormElementTextNumber.createInstance().setTitle("Substrate Size").setValue("0"); - FormElementTextNumber element3 = FormElementTextNumber.createInstance().setTitle("Smothering").setValue("0"); - FormElementTextNumber element4 = FormElementTextNumber.createInstance().setTitle("Silting").setValue("0"); - FormElementTextNumber element5 = FormElementTextNumber.createInstance().setTitle("Rootwads").setValue("0"); - FormElementTextNumber element6 = FormElementTextNumber.createInstance().setTitle("Overhanging Veg.").setValue("0"); - FormElementTextNumber element7 = FormElementTextNumber.createInstance().setTitle("Oxbows/Black Waters").setValue("0"); - FormElementTextNumber element8 = FormElementTextNumber.createInstance().setTitle("Downed Trees/Logs").setValue("0"); - FormElementTextNumber element9 = FormElementTextNumber.createInstance().setTitle("Shallows (slow water)").setValue("0"); - FormElementTextNumber element10 = FormElementTextNumber.createInstance().setTitle("Water Plants").setValue("0"); - FormElementTextNumber element11 = FormElementTextNumber.createInstance().setTitle("Deep Pools").setValue("0"); - FormElementTextNumber element12 = FormElementTextNumber.createInstance().setTitle("Logs/Woody Debris").setValue("0"); - FormElementTextNumber element13 = FormElementTextNumber.createInstance().setTitle("Boulders").setValue("0"); - FormElementTextNumber element14 = FormElementTextNumber.createInstance().setTitle("Undercut Banks").setValue("0"); - FormElementTextNumber element15 = FormElementTextNumber.createInstance().setTitle("Sinuosity").setValue("0"); - FormElementTextNumber element16 = FormElementTextNumber.createInstance().setTitle("Natural").setValue("0"); - FormElementTextNumber element17 = FormElementTextNumber.createInstance().setTitle("Riparian Width").setValue("0"); - FormElementTextNumber element18 = FormElementTextNumber.createInstance().setTitle("Land Use").setValue("0"); - FormElementTextNumber element19 = FormElementTextNumber.createInstance().setTitle("Bank Erosion").setValue("0"); - - formItemsHQ = new ArrayList<>(); - - formItemsHQ.add(element2); - formItemsHQ.add(element3); - formItemsHQ.add(element4); - formItemsHQ.add(element5); - formItemsHQ.add(element6); - formItemsHQ.add(element7); - formItemsHQ.add(element8); - formItemsHQ.add(element9); - formItemsHQ.add(element10); - formItemsHQ.add(element11); - formItemsHQ.add(element12); - formItemsHQ.add(element13); - formItemsHQ.add(element14); - formItemsHQ.add(element15); - formItemsHQ.add(element16); - formItemsHQ.add(element17); - formItemsHQ.add(element18); - formItemsHQ.add(element19); - fbHQ.addFormElements(formItemsHQ); + List array_subSize = new ArrayList<>(); + array_subSize.add("14: Large(4\" or larger)"); + array_subSize.add("10: Medium(1\" to 4\")"); + array_subSize.add("6: Small(.25\" to 1\")"); + array_subSize.add("0: Fine(granular)"); + + FormElementPickerSingle subSize = FormElementPickerSingle.createInstance().setTitle("Substrate Size").setOptions(array_subSize).setPickerTitle("Pick one option"); + List array_yesNo5 = new ArrayList<>(); + array_yesNo5.add("0: Yes"); + array_yesNo5.add("5: No"); + + List array_yesNo2 = new ArrayList<>(); + array_yesNo2.add("2: Yes"); + array_yesNo2.add("0: No"); + + List array_sinuosity = new ArrayList<>(); + array_sinuosity.add("8: Two or more bends"); + array_sinuosity.add("3: Less than two bends"); + + List array_natural = new ArrayList<>(); + array_natural.add("12: Mostly Natural"); + array_natural.add("9: Minor Man-made impacts"); + array_natural.add("6: Many Man-made changes"); + array_natural.add("0: Completely Manipulated"); + + List array_riparian = new ArrayList<>(); + array_riparian.add("8: Wide (20' or more)"); + array_riparian.add("5: Narrow (Less than 20')"); + array_riparian.add("0: None"); + + List array_landUse = new ArrayList<>(); + array_landUse.add("5: Forest/Wetland"); + array_landUse.add("4: Shrub"); + array_landUse.add("3: Overgrown Fields"); + array_landUse.add("2: Fenced Pasture"); + array_landUse.add("2: Parkland/Grass"); + array_landUse.add("2: Conservation Tillage"); + array_landUse.add("1: Row Crop"); + array_landUse.add("0: Open Pasture"); + array_landUse.add("0: Urban/Industrial"); + + List array_bankErosion = new ArrayList<>(); + array_bankErosion.add("4: None/Little"); + array_bankErosion.add("2: Moderate"); + array_bankErosion.add("0: Heavy/Severe"); + + FormElementPickerSingle smothering = FormElementPickerSingle.createInstance().setTitle("Smothering").setOptions(array_yesNo5).setPickerTitle("Pick one option"); + FormElementPickerSingle silting = FormElementPickerSingle.createInstance().setTitle("Silting").setOptions(array_yesNo5).setPickerTitle("Pick one option"); + FormElementPickerSingle rootwads = FormElementPickerSingle.createInstance().setTitle("Rootwads").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle overhangingVeg = FormElementPickerSingle.createInstance().setTitle("Overhanging Veg.").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle oxbows = FormElementPickerSingle.createInstance().setTitle("Oxbows/Black Waters").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle downed = FormElementPickerSingle.createInstance().setTitle("Downed Trees/Logs").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle shallows = FormElementPickerSingle.createInstance().setTitle("Shallows (slow water)").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle waterPlants = FormElementPickerSingle.createInstance().setTitle("Water Plants").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle deepPools = FormElementPickerSingle.createInstance().setTitle("Deep Pools").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle logs = FormElementPickerSingle.createInstance().setTitle("Logs/Woody Debris").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle boulders = FormElementPickerSingle.createInstance().setTitle("Boulders").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle undercutBanks = FormElementPickerSingle.createInstance().setTitle("Undercut Banks").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + FormElementPickerSingle sinuosity = FormElementPickerSingle.createInstance().setTitle("Sinuosity").setOptions(array_sinuosity).setPickerTitle("Pick one option"); + FormElementPickerSingle natural = FormElementPickerSingle.createInstance().setTitle("Natural").setOptions(array_natural).setPickerTitle("Pick one option"); + FormElementPickerSingle riparianWidth = FormElementPickerSingle.createInstance().setTitle("Riparian Width").setOptions(array_riparian).setPickerTitle("Pick one option"); + FormElementPickerSingle landUse = FormElementPickerSingle.createInstance().setTitle("Land Use").setOptions(array_landUse).setPickerTitle("Pick one option"); + FormElementPickerSingle bankErosion = FormElementPickerSingle.createInstance().setTitle("Bank Erosion").setOptions(array_bankErosion).setPickerTitle("Pick one option"); + + + List formItems = new ArrayList<>(); + formItems.add(subSize); + formItems.add(smothering); + formItems.add(silting); + formItems.add(rootwads); + formItems.add(overhangingVeg); + formItems.add(oxbows); + formItems.add(downed); + formItems.add(shallows); + formItems.add(waterPlants); + formItems.add(deepPools); + formItems.add(logs); + formItems.add(boulders); + formItems.add(undercutBanks); + formItems.add(sinuosity); + formItems.add(natural); + formItems.add(riparianWidth); + formItems.add(landUse); + formItems.add(bankErosion); + + fbHQ.addFormElements(formItems); + subVal = pickerValue(subSize); + sub = subSize.getValue(); + smothVal = pickerValue(smothering); + smoth = smothering.getValue(); + siltVal = pickerValue(silting); + silt = silting.getValue(); + rootVal = pickerValue(rootwads); + rootString = rootwads.getValue(); + overVegVal = pickerValue(overhangingVeg); + overVeg = overhangingVeg.getValue(); + oxVal = pickerValue(oxbows); + ox = oxbows.getValue(); + downVal = pickerValue(downed); + down = downed.getValue(); + shallowVal = pickerValue(shallows); + shallow = shallows.getValue(); + watVal = pickerValue(waterPlants); + wat = waterPlants.getValue(); + deepVal = pickerValue(deepPools); + deep = deepPools.getValue(); + logVal = pickerValue(logs); + log = logs.getValue(); + bouldVal = pickerValue(boulders); + bould = boulders.getValue(); + underVal = pickerValue(undercutBanks); + under = undercutBanks.getValue(); + sinVal = pickerValue(sinuosity); + sin = sinuosity.getValue(); + natVal = pickerValue(natural); + nat = natural.getValue(); + ripVal = pickerValue(riparianWidth); + rip = riparianWidth.getValue(); + landVal = pickerValue(landUse); + land = landUse.getValue(); + bankVal = pickerValue(bankErosion); + bank = bankErosion.getValue(); } + + private double pickerValue(FormElementPickerSingle var){ + int index = var.getValue().indexOf(":"); + double pickerOption; + if (index > 0) + { + pickerOption = Double.parseDouble(var.getValue().substring(0,index)); + } + else + { + pickerOption = 0; + } + return(pickerOption); + } 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); @@ -362,15 +585,6 @@ private void setupFormCT() { boolct = true; fbCT = new FormBuilder(getContext(), rvCT); - double tempVal = 0; - double turbidityVal = 0; - double phVal = 0; - double nitrateVal = 0; - double phosphateVal = 0; - double oxygenVal = 0; - double coliVal = 0; - String other1Val = ""; - String other2Val = ""; FormHeader title = (FormHeader) new FormHeader().setTitle("Chemical Testing"); From 7c0a5e8fe8318b088005d5f4083992ce342eef59 Mon Sep 17 00:00:00 2001 From: John Parrell Date: Sat, 10 Apr 2021 14:37:33 -0400 Subject: [PATCH 15/18] Added map and completed Tolerant form to WaterWayFormFragment --- .../WaterWay/WaterWayFormFragment.java | 50 ++++++++++++++----- 1 file changed, 38 insertions(+), 12 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 277e413..cf49a79 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java @@ -112,6 +112,11 @@ public class WaterWayFormFragment extends Fragment { double ripVal = 0.0; double landVal = 0.0; double bankVal = 0.0; + //Tolerant Form + double intolerantVal = 0.0; + double modTolerantVal = 0.0; + double fairTolerantVal = 0.0; + double veryTolerantVal = 0.0; RecyclerView rvGen, rvDWS, rvHQ, rvBM,rvCT; FormBuilder fbGEn,fbDWS,fbBM,fbHQ,fbCT; SegmentedButton gen,dws,ct,bm,hq; @@ -177,10 +182,10 @@ public void onClick(View v) { WaterWayDoubleFields.put("CT_total_phosphate", phosphateVal); WaterWayDoubleFields.put("CT_dissolved_oxygen", oxygenVal); //PTI Data - WaterWayDoubleFields.put("BM_intolerant", new Double(0.0)); - WaterWayDoubleFields.put("BM_moderately_tolerant", new Double(0.0)); - WaterWayDoubleFields.put("BM_fairly_tolerant", new Double(0.0)); - WaterWayDoubleFields.put("BM_very_tolerant", new Double(0.0)); + WaterWayDoubleFields.put("BM_intolerant", intolerantVal); + WaterWayDoubleFields.put("BM_moderately_tolerant", modTolerantVal); + WaterWayDoubleFields.put("BM_fairly_tolerant", fairTolerantVal); + WaterWayDoubleFields.put("BM_very_tolerant", veryTolerantVal); WaterWayDoubleFields.put("WQI", new Double(0.0)); WaterWayDoubleFields.put("HEI", new Double(0.0)); @@ -225,14 +230,14 @@ public void onClick(View v) { WaterWayStringFields.put("QHEI_rifflerun_depth", ""); WaterWayStringFields.put("QHEI_rifflerun_substrate", ""); - WaterWayStringFields.put("GOD_channel_bottom_width", ""); - WaterWayStringFields.put("GOD_invert_elevation", ""); - WaterWayStringFields.put("GOD_latitude", ""); - WaterWayStringFields.put("GOD_longitude", ""); - WaterWayStringFields.put("GOD_outfall", ""); - WaterWayStringFields.put("GOD_pipe_size", ""); - WaterWayStringFields.put("GOD_receiving_water", ""); - WaterWayStringFields.put("GOD_type", ""); + WaterWayStringFields.put("GOD_channel_bottom_width", channelBottomWidth); + WaterWayStringFields.put("GOD_invert_elevation", invertElevation); + WaterWayStringFields.put("GOD_latitude", latitude); + WaterWayStringFields.put("GOD_longitude", longitude); + WaterWayStringFields.put("GOD_outfall", outfall); + WaterWayStringFields.put("GOD_pipe_size", pipeSize); + WaterWayStringFields.put("GOD_receiving_water", receivingWater); + WaterWayStringFields.put("GOD_type", type); //Comments WaterWayStringFields.put("CS_comments", ""); @@ -580,7 +585,28 @@ private void setupFormDWS() { fbDWS.addFormElements(formItemsDWS); } + private void setupTolerantForm(){ + formBuilder = new FormBuilder(this, recyclerView); + FormElementTextNumber intolerant = FormElementTextNumber.createInstance().setTitle("Intolerant").setValue("0"); + FormElementTextNumber moderatelyTolerant = FormElementTextNumber.createInstance().setTitle("Moderately Tolerant").setValue("0"); + FormElementTextNumber fairlyTolerant = FormElementTextNumber.createInstance().setTitle("Fairly Tolerant").setValue("0"); + FormElementTextNumber veryTolerant = FormElementTextNumber.createInstance().setTitle("Very Tolerant").setValue("0"); + + List formItems = new ArrayList<>(); + formItems.add(intolerant); + formItems.add(moderatelyTolerant); + formItems.add(fairlyTolerant); + formItems.add(veryTolerant); + + intolerantVal = Double.parseDouble(intolerant.getValue()); + modTolerantVal = Double.parseDouble(moderatelyTolerant.getValue()); + fairTolerantVal = Double.parseDouble(fairlyTolerant.getValue()); + veryTolerantVal = Double.parseDouble(veryTolerant.getValue()); + + + + } private void setupFormCT() { boolct = true; fbCT = new FormBuilder(getContext(), rvCT); From 0b4b110496895a3be2159d81584854cd55cf0d0a Mon Sep 17 00:00:00 2001 From: John Parrell Date: Sat, 10 Apr 2021 15:11:08 -0400 Subject: [PATCH 16/18] Added all variables to WaterWayFormFragment --- .../WaterWay/WaterWayFormFragment.java | 116 +++++++++++++----- 1 file changed, 86 insertions(+), 30 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 cf49a79..8eb70fa 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java @@ -93,6 +93,11 @@ public class WaterWayFormFragment extends Fragment { String rip = ""; String land = ""; String bank = ""; + String stream = ""; + String deepest = ""; + String velocity = ""; + String riffleDepthVar = ""; + String riffleSubstrateVar = ""; boolean screenOK = false; double subVal = 0.0; double smothVal = 0.0; @@ -112,6 +117,11 @@ public class WaterWayFormFragment extends Fragment { double ripVal = 0.0; double landVal = 0.0; double bankVal = 0.0; + double streamVal = 0.0; + double deepestVal = 0.0; + double velocityVal = 0.0; + double riffleDepthVal = 0.0; + double riffleSubstrateVal = 0.0; //Tolerant Form double intolerantVal = 0.0; double modTolerantVal = 0.0; @@ -224,11 +234,11 @@ public void onClick(View v) { WaterWayStringFields.put("QHEI_riparian_width", rip); WaterWayStringFields.put("QHEI_land_use", land); WaterWayStringFields.put("QHEI_bank_erosion", bank); - WaterWayStringFields.put("QHEI_stream_shading", ""); - WaterWayStringFields.put("QHEI_deepest_pool", ""); - WaterWayStringFields.put("QHEI_velocity", ""); - WaterWayStringFields.put("QHEI_rifflerun_depth", ""); - WaterWayStringFields.put("QHEI_rifflerun_substrate", ""); + WaterWayStringFields.put("QHEI_stream_shading", stream); + WaterWayStringFields.put("QHEI_deepest_pool", deepest); + WaterWayStringFields.put("QHEI_velocity", velocity); + WaterWayStringFields.put("QHEI_rifflerun_depth", riffleDepthVar); + WaterWayStringFields.put("QHEI_rifflerun_substrate", riffleSubstrateVar); WaterWayStringFields.put("GOD_channel_bottom_width", channelBottomWidth); WaterWayStringFields.put("GOD_invert_elevation", invertElevation); @@ -446,6 +456,35 @@ private void setupFormHQ() { array_bankErosion.add("2: Moderate"); array_bankErosion.add("0: Heavy/Severe"); + List array_streamShading = new ArrayList<>(); + array_streamShading.add("3: Mostly"); + array_streamShading.add("2: Moderate"); + array_streamShading.add("0: Heavy/Severe"); + + List array_deepestPool = new ArrayList<>(); + array_deepestPool.add("8: Chest Deep"); + array_deepestPool.add("6: Waist Deep"); + array_deepestPool.add("4: Knee Deep"); + array_deepestPool.add("0: None"); + + List array_velocity = new ArrayList<>(); + array_velocity.add("2: Very Fast"); + array_velocity.add("3: Fast"); + array_velocity.add("1: Moderate"); + array_velocity.add("1: Slow"); + array_velocity.add("0: None"); + + List array_riffleDepth = new ArrayList<>(); + array_riffleDepth.add("8: At Least Knee Deep and Fast"); + array_riffleDepth.add("6: Ankle-Calf Deep and Fast"); + array_riffleDepth.add("4: Ankle-Calf Deep and Slow"); + array_riffleDepth.add("0: Do Not Exist"); + + List array_riffleSub = new ArrayList<>(); + array_riffleSub.add("7: 4\" or larger"); + array_riffleSub.add("4: 1\"-4\""); + array_riffleSub.add("0: Less than 1\" or None"); + FormElementPickerSingle smothering = FormElementPickerSingle.createInstance().setTitle("Smothering").setOptions(array_yesNo5).setPickerTitle("Pick one option"); FormElementPickerSingle silting = FormElementPickerSingle.createInstance().setTitle("Silting").setOptions(array_yesNo5).setPickerTitle("Pick one option"); FormElementPickerSingle rootwads = FormElementPickerSingle.createInstance().setTitle("Rootwads").setOptions(array_yesNo2).setPickerTitle("Pick one option"); @@ -463,8 +502,11 @@ private void setupFormHQ() { FormElementPickerSingle riparianWidth = FormElementPickerSingle.createInstance().setTitle("Riparian Width").setOptions(array_riparian).setPickerTitle("Pick one option"); FormElementPickerSingle landUse = FormElementPickerSingle.createInstance().setTitle("Land Use").setOptions(array_landUse).setPickerTitle("Pick one option"); FormElementPickerSingle bankErosion = FormElementPickerSingle.createInstance().setTitle("Bank Erosion").setOptions(array_bankErosion).setPickerTitle("Pick one option"); - - + FormElementPickerSingle streamShading = FormElementPickerSingle.createInstance().setTitle("Stream Shading").setOptions(array_streamShading).setPickerTitle("Pick one option"); + FormElementPickerSingle deepestPool = FormElementPickerSingle.createInstance().setTitle("Deepest Pool").setOptions(array_deepestPool).setPickerTitle("Pick one option"); + FormElementPickerSingle velocityForm = FormElementPickerSingle.createInstance().setTitle("Velocity").setOptions(array_velocity).setPickerTitle("Pick one option"); + FormElementPickerSingle riffleDepth = FormElementPickerSingle.createInstance().setTitle("Riffle/Run Depth").setOptions(array_riffleDepth).setPickerTitle("Pick one option"); + FormElementPickerSingle riffleSub = FormElementPickerSingle.createInstance().setTitle("Riffle/Run Substrate").setOptions(array_riffleSub).setPickerTitle("Pick one option"); List formItems = new ArrayList<>(); formItems.add(subSize); formItems.add(smothering); @@ -484,7 +526,11 @@ private void setupFormHQ() { formItems.add(riparianWidth); formItems.add(landUse); formItems.add(bankErosion); - + formItems.add(streamShading); + formItems.add(deepestPool); + formItems.add(velocityForm); + formItems.add(riffleDepth); + formItems.add(riffleSub); fbHQ.addFormElements(formItems); subVal = pickerValue(subSize); sub = subSize.getValue(); @@ -497,6 +543,12 @@ private void setupFormHQ() { overVegVal = pickerValue(overhangingVeg); overVeg = overhangingVeg.getValue(); oxVal = pickerValue(oxbows); + streamVal = pickerValue(streamShading); + deepestVal = pickerValue(deepestPool); + velocityVal = pickerValue(velocityForm); + riffleDepthVal = pickerValue(riffleDepth); + riffleSubstrateVal = pickerValue(riffleSub); + ox = oxbows.getValue(); downVal = pickerValue(downed); down = downed.getValue(); @@ -522,6 +574,13 @@ private void setupFormHQ() { land = landUse.getValue(); bankVal = pickerValue(bankErosion); bank = bankErosion.getValue(); + stream = streamShading.getValue(); + deepest = deepestPool.getValue(); + velocity = velocityForm.getValue(); + riffleDepthVar = riffleDepth.getValue(); + riffleSubstrateVar = riffleSub.getValue(); + + } @@ -584,28 +643,6 @@ private void setupFormDWS() { formItemsDWS.add(screen); fbDWS.addFormElements(formItemsDWS); - } - private void setupTolerantForm(){ - formBuilder = new FormBuilder(this, recyclerView); - - FormElementTextNumber intolerant = FormElementTextNumber.createInstance().setTitle("Intolerant").setValue("0"); - FormElementTextNumber moderatelyTolerant = FormElementTextNumber.createInstance().setTitle("Moderately Tolerant").setValue("0"); - FormElementTextNumber fairlyTolerant = FormElementTextNumber.createInstance().setTitle("Fairly Tolerant").setValue("0"); - FormElementTextNumber veryTolerant = FormElementTextNumber.createInstance().setTitle("Very Tolerant").setValue("0"); - - List formItems = new ArrayList<>(); - formItems.add(intolerant); - formItems.add(moderatelyTolerant); - formItems.add(fairlyTolerant); - formItems.add(veryTolerant); - - intolerantVal = Double.parseDouble(intolerant.getValue()); - modTolerantVal = Double.parseDouble(moderatelyTolerant.getValue()); - fairTolerantVal = Double.parseDouble(fairlyTolerant.getValue()); - veryTolerantVal = Double.parseDouble(veryTolerant.getValue()); - - - } private void setupFormCT() { boolct = true; @@ -658,6 +695,25 @@ private void setupFormCT() { } private void setupFormBM() { boolbm = true; + fbBM = new FormBuilder(getContext(), rvBM); + + FormElementTextNumber intolerant = FormElementTextNumber.createInstance().setTitle("Intolerant").setValue("0"); + FormElementTextNumber moderatelyTolerant = FormElementTextNumber.createInstance().setTitle("Moderately Tolerant").setValue("0"); + FormElementTextNumber fairlyTolerant = FormElementTextNumber.createInstance().setTitle("Fairly Tolerant").setValue("0"); + FormElementTextNumber veryTolerant = FormElementTextNumber.createInstance().setTitle("Very Tolerant").setValue("0"); + + List formItemsBM = new ArrayList<>(); + formItemsBM.add(intolerant); + formItemsBM.add(moderatelyTolerant); + formItemsBM.add(fairlyTolerant); + formItemsBM.add(veryTolerant); + + intolerantVal = Double.parseDouble(intolerant.getValue()); + modTolerantVal = Double.parseDouble(moderatelyTolerant.getValue()); + fairTolerantVal = Double.parseDouble(fairlyTolerant.getValue()); + veryTolerantVal = Double.parseDouble(veryTolerant.getValue()); + + fbBM.addFormElements(formItemsBM); } public boolean convertToBoolean(String s) { From 59b137edded26d5e231913aad58ce35760005422 Mon Sep 17 00:00:00 2001 From: John Parrell Date: Sat, 10 Apr 2021 22:08:19 -0400 Subject: [PATCH 17/18] Integrated formulas for WQI, HEI, and PTI --- .../WaterWay/WaterWayFormFragment.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 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 8eb70fa..9fe3477 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java @@ -197,9 +197,9 @@ public void onClick(View v) { WaterWayDoubleFields.put("BM_fairly_tolerant", fairTolerantVal); WaterWayDoubleFields.put("BM_very_tolerant", veryTolerantVal); - WaterWayDoubleFields.put("WQI", new Double(0.0)); - WaterWayDoubleFields.put("HEI", new Double(0.0)); - WaterWayDoubleFields.put("PTI", new Double(0.0)); + WaterWayDoubleFields.put("WQI", calculateWQI()); + WaterWayDoubleFields.put("HEI", calculate_HEI()); + WaterWayDoubleFields.put("PTI", calculatePTI()); //Boolean Fields WaterWayBoolFields.put("DWS_needs_maintenance", needMaintenance); @@ -313,7 +313,23 @@ public void onClick(View v) { return root; } + private double calculate_HEI() + { + return subVal + smothVal + siltVal + rootVal + overVegVal + + oxVal + downVal + shallowVal + watVal + deepVal + + logVal + bouldVal + underVal + 2 * (sinVal + natVal) + + ripVal + landVal + bankVal + streamVal + deepestVal + + velocityVal + riffleDepthVal + riffleSubstrateVal; + } + private double calculatePTI() { + return 4.0 * intolerantVal + 3.0 * modTolerantVal + 2.0 * fairTolerantVal + 1.0 * veryTolerantVal; + } + private double calculateWQI() { + double WQIScore = tempVal * 0.11 + turbidityVal * 0.09 + phVal * 0.12 + nitrateVal * 0.1 + + phosphateVal * 0.11 + oxygenVal * 0.18; + return WQIScore; + } private void setupFormGen() { boolgen = true; From ae2345a73c3d8be99547d28eac9f93d4b0e653b3 Mon Sep 17 00:00:00 2001 From: John Parrell Date: Wed, 14 Apr 2021 16:53:55 -0400 Subject: [PATCH 18/18] Troubleshooted variable declarations --- .../WaterWay/WaterWayFormFragment.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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 9fe3477..69bd48c 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java @@ -39,10 +39,10 @@ public class WaterWayFormFragment extends Fragment { String nameOfSite = ""; String dateRow = ""; - double outfall = 0.0; - double longitude = 0.0; - double latitude = 0.0; - double invertElevation = 0.0; + String outfall = ""; + String longitude = ""; + String latitude = ""; + String invertElevation = ""; String type = ""; String pipeSize = ""; @@ -352,19 +352,19 @@ private void setupFormGen() { formItemsGen.add(date); FormElementTextSingleLine outfallValue = FormElementTextSingleLine.createInstance().setTitle("Outfall").setValue("0"); - outfall = Double.parseDouble(outfallValue.getValue()); + outfall = String.valueOf(outfallValue.getValue()); formItemsGen.add(outfallValue); FormElementTextSingleLine longitudeValue = FormElementTextSingleLine.createInstance().setTitle("Longitude").setValue("0"); - longitude = Double.parseDouble(longitudeValue.getValue()); + longitude = String.valueOf(longitudeValue.getValue()); formItemsGen.add(longitudeValue); FormElementTextSingleLine latitudeValue = FormElementTextSingleLine.createInstance().setTitle("Latitude").setValue("0"); - latitude = Double.parseDouble(latitudeValue.getValue()); + latitude = String.valueOf(latitudeValue.getValue()); formItemsGen.add(latitudeValue); FormElementTextSingleLine invertElevationValue = FormElementTextSingleLine.createInstance().setTitle("Invert Elevation").setValue("0"); - invertElevation = Double.parseDouble(invertElevationValue.getValue()); + invertElevation = String.valueOf(invertElevationValue.getValue()); formItemsGen.add(invertElevationValue); List pipeTypeOptions = new ArrayList();