From 6b8887081534c4fc3ea1976be4dfdea434c55b00 Mon Sep 17 00:00:00 2001 From: evanwilliams Date: Sat, 27 Mar 2021 23:01:06 -0400 Subject: [PATCH] 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() {