diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..c6e7f40 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +StormWaterUtilityAndroid \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0947cea..6b5108f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,13 +20,14 @@ + > + diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/Construction/ConstructionFormFragment.java b/app/src/main/java/com/sf/stormwaterutilityandroid/Construction/ConstructionFormFragment.java index bb325fa..95b3678 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/Construction/ConstructionFormFragment.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/Construction/ConstructionFormFragment.java @@ -4,22 +4,49 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; +import androidx.recyclerview.widget.RecyclerView; +import com.google.firebase.Timestamp; +import com.google.type.DateTime; import com.sf.stormwaterutilityandroid.R; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; +import java.util.Arrays; +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.FormElementSwitch; +import me.riddhimanadib.formmaster.model.FormElementTextMultiLine; +import me.riddhimanadib.formmaster.model.FormElementTextSingleLine; +import me.riddhimanadib.formmaster.model.FormHeader; + public class ConstructionFormFragment extends Fragment { + private FormBuilder formBuilder; + private RecyclerView recyclerView; + private Button submitButton; + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - public View onCreateView(@NonNull LayoutInflater inflater, - ViewGroup container, Bundle savedInstanceState) { + View root = inflater.inflate(R.layout.activity_sample_fordm, container, false); - View root = inflater.inflate(R.layout.fragment_home, container, false); + recyclerView = root.findViewById(R.id.recyclerView2); - return root; + recyclerView.addView(submitButton); + return root; } + + } \ No newline at end of file diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java index 6bec762..20828fa 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java @@ -28,6 +28,15 @@ public class DryWeatherScreening extends AppCompatActivity{ private FormBuilder formBuilder; private RecyclerView recyclerView; + + String flowVal = ""; + String odorVal = ""; + String colorVal = ""; + String polutantsVal = ""; + String obstructionVal = ""; + String maintenanceVal = ""; + String screenVal = ""; + FormElementTextEmail element11; //I assume onCreate is important so I will leave it unchanged protected void onCreate(Bundle savedInstanceState) { @@ -43,24 +52,31 @@ private void setupForm() { //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 odor = new FormElementTextSingleLine().setTitle("Unusual Odor"); FormElementTextNumber odorData = FormElementTextNumber.createInstance(); + odorVal = odorData.getValue(); FormElementTextSingleLine color = new FormElementTextSingleLine().setTitle("Unusual Color"); FormElementTextNumber colorData = FormElementTextNumber.createInstance(); + colorVal = colorData.getValue(); FormElementTextSingleLine polutants = new FormElementTextSingleLine().setTitle("Polutants Nearby"); FormElementTextNumber polutantsData = FormElementTextNumber.createInstance(); + polutantsVal = polutantsData.getValue(); FormElementTextSingleLine obstruction = new FormElementTextSingleLine().setTitle("Obstruction"); FormElementTextNumber obstructionData = FormElementTextNumber.createInstance(); + obstructionVal = obstructionData.getValue(); FormElementTextSingleLine maintenance = new FormElementTextSingleLine().setTitle("Needs Maintenance"); FormElementTextNumber maintenanceData = FormElementTextNumber.createInstance(); + maintenanceVal = maintenanceData.getValue(); FormElementTextSingleLine screen = new FormElementTextSingleLine().setTitle("Screen OK"); FormElementTextNumber screenData = FormElementTextNumber.createInstance(); + screenVal = screenData.getValue(); List formItems = new ArrayList<>(); diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/HEI.java b/app/src/main/java/com/sf/stormwaterutilityandroid/HEI.java index a803dee..85ff781 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/HEI.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/HEI.java @@ -28,7 +28,10 @@ public class HEI { //constructor HEI(double QHEI_substrate_size, double QHEI_smothering, double QHEI_silting, double QHEI_rootwads, double QHEI_overhanging_veg, - double QHEI_oxbowsblack_waters, double QHEI_downed_treeslogs, double QHEI_shallows, double QHEI_water_plants, double QHEI_logswoody_debris, + + + double QHEI_oxbowsblack_waters, double QHEI_downed_treeslogs, double QHEI_shallows, double QHEI_water_plants, double QHEI_logswoody_debris, + double QHEI_boulders, double QHEI_undercut_banks, double QHEI_sinuosity, double QHEI_natural, double QHEI_riparian_width, double QHEI_land_use, double QHEI_bank_erosion, double QHEI_stream_shading, double QHEI_deepest_pool, double QHEI_velocity, double QHEI_rifflerun_depth, double QHEI_rifflerun_substrate, double QHEI_deep_pools) { @@ -79,4 +82,6 @@ public static double get_HEI(double QHEI_substrate_size, double QHEI_smothering, QHEI_velocity + QHEI_rifflerun_depth + QHEI_rifflerun_substrate; } -} \ No newline at end of file + +} + diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java b/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java index b1d39b2..1263147 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java @@ -34,6 +34,7 @@ protected void onCreate(Bundle savedInstanceState) { // submitButton = findViewById(R.id.submitButton); + setupForm(); } 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 19e621c..7befa77 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java @@ -26,9 +26,22 @@ public class ChemicalTesting extends AppCompatActivity{ private FormBuilder formBuilder; private RecyclerView recyclerView; + + 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; + 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); @@ -45,30 +58,39 @@ private void setupForm() { 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()); FormElementTextSingleLine tubidity = new FormElementTextSingleLine().setTitle("Tubidity (NTU)"); FormElementTextNumber tubidityData = FormElementTextNumber.createInstance(); + turbidityVal = Double.parseDouble(tubidityData.getValue()); FormElementTextSingleLine pH = new FormElementTextSingleLine().setTitle("pH"); FormElementTextNumber pHData = FormElementTextNumber.createInstance(); + phVal = Double.parseDouble(pHData.getValue()); FormElementTextSingleLine nitrate = new FormElementTextSingleLine().setTitle("Nitrate (mg/L)"); FormElementTextNumber nitrateData = FormElementTextNumber.createInstance(); + nitrateVal = Double.parseDouble(nitrateData.getValue()); FormElementTextSingleLine phosphate = new FormElementTextSingleLine().setTitle("Total Phosphate (mg/L)"); FormElementTextNumber phosphateData = FormElementTextNumber.createInstance(); + phosphateVal = Double.parseDouble(nitrateData.getValue()); FormElementTextSingleLine oxygen = new FormElementTextSingleLine().setTitle("Dissolved Oxygen (mg/L)"); FormElementTextNumber oxygenData = FormElementTextNumber.createInstance(); + oxygenVal = Double.parseDouble(oxygenData.getValue()); FormElementTextSingleLine coli = new FormElementTextSingleLine().setTitle("E Coli (col/100mL)"); FormElementTextNumber coliData = FormElementTextNumber.createInstance(); + coliVal = Double.parseDouble(coliData.getValue()); FormElementTextSingleLine other1 = new FormElementTextSingleLine().setTitle("Other 1"); FormElementTextNumber other1Data = FormElementTextNumber.createInstance(); + other1Val = Double.parseDouble(other1Data.getValue()); FormElementTextSingleLine other2 = new FormElementTextSingleLine().setTitle("Other 2"); FormElementTextNumber other2Data = FormElementTextNumber.createInstance(); + other2Val = Double.parseDouble(other2.getValue()); List formItems = new ArrayList<>(); @@ -93,6 +115,5 @@ private void setupForm() { formItems.add(other2Data); formBuilder.addFormElements(formItems); - } } diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/PTI.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/PTI.java index c46ef0b..3b5dc89 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/PTI.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/PTI.java @@ -36,4 +36,5 @@ public double calculatePTI() { public static double getPTI(double intolerant, double moderate, double fairly, double very) { return 4.0 * intolerant + 3.0 * moderate + 2.0 * fairly + 1.0 * very; } -} \ No newline at end of file + +} diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WQI.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WQI.java index 0426992..72d7601 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WQI.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WQI.java @@ -28,4 +28,8 @@ public double calculateWQI() { public static double getWQI(double tempChange, double turbidity, double pH, double nitrate, double phosphate, double oxygen) { return tempChange * 0.11 + turbidity * 0.09 + pH * 0.12 + nitrate * 0.1 + phosphate * 0.11 + oxygen * 0.18; } -} \ No newline at end of file + +} + +} + diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWay.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWay.java new file mode 100644 index 0000000..b7449aa --- /dev/null +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWay.java @@ -0,0 +1,83 @@ +package com.sf.stormwaterutilityandroid.WaterWay; + +import java.util.Map; +import java.util.HashMap; + +public class WaterWay { + + private Map WaterWayDoubleFields = new HashMap(); + private Map WaterWayBoolFields = new HashMap(); + private Map WaterWayStringFields = new HashMap(); + + public WaterWay() { + //Water Quality Index Data + WaterWayDoubleFields.put("CT_temperature_change", new Double(0.0)); + WaterWayDoubleFields.put("CT_turbidity", new Double(0.0)); + WaterWayDoubleFields.put("CT_pH", new Double(0.0)); + WaterWayDoubleFields.put("CT_nitrate", new Double(0.0)); + WaterWayDoubleFields.put("CT_total_phosphate", new Double(0.0)); + WaterWayDoubleFields.put("CT_dissolved_oxygen", new Double(0.0)); + //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", new Boolean(false)); + WaterWayBoolFields.put("DWS_obstruction", new Boolean(false)); + WaterWayBoolFields.put("DWS_polutants", new Boolean(false)); + WaterWayBoolFields.put("DWS_presence_of_flow", new Boolean(false)); + WaterWayBoolFields.put("DWS_screened_OK", new Boolean(false)); + WaterWayBoolFields.put("DWS_unusual_color", new Boolean(false)); + WaterWayBoolFields.put("DWS_unusual_odor", new Boolean(false)); + 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", ""); + WaterWayStringFields.put("QHEI_smothering", ""); + WaterWayStringFields.put("QHEI_silting", ""); + WaterWayStringFields.put("QHEI_rootwads", ""); + WaterWayStringFields.put("QHEI_overhanging_veg", ""); + WaterWayStringFields.put("QHEI_oxbowsblack_waters", ""); + WaterWayStringFields.put("QHEI_downed_treeslogs",""); + WaterWayStringFields.put("QHEI_shallows", ""); + WaterWayStringFields.put("QHEI_water_plants", ""); + WaterWayStringFields.put("QHEI_deep_pools", ""); + WaterWayStringFields.put("QHEI_logswoody_debris", ""); + WaterWayStringFields.put("QHEI_boulders", ""); + WaterWayStringFields.put("QHEI_undercut_banks", ""); + WaterWayStringFields.put("QHEI_sinuosity", ""); + WaterWayStringFields.put("QHEI_riparian_width", ""); + WaterWayStringFields.put("QHEI_land_use", ""); + WaterWayStringFields.put("QHEI_bank_erosion", ""); + 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", ""); + } +} 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 0d5fc0a..8ceee50 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java @@ -8,7 +8,9 @@ import com.sf.stormwaterutilityandroid.R; 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; @@ -18,60 +20,127 @@ public class WaterWayForm extends AppCompatActivity { //HQ form private FormBuilder formBuilder; private RecyclerView recyclerView; + 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; + + //Tolerant Form + double intolerantVal = 0.0; + double modTolerantVal = 0.0; + double fairTolerantVal = 0.0; + double veryTolerantVal = 0.0; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.fragment_wwform); - recyclerView = findViewById(R.id.rvWWF); - setupForm(); - } - private void setupForm() { + setContentView(R.layout.activity_sample_fordm); + recyclerView = findViewById(R.id.recyclerView2); + setupHQForm(); + + } + private void setupHQForm() { formBuilder = new FormBuilder(this, recyclerView); - 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"); + FormElementTextNumber subSize = FormElementTextNumber.createInstance().setTitle("Substrate Size").setValue("0"); + 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 formItems = new ArrayList<>(); - formItems.add(element2); - formItems.add(element3); - formItems.add(element4); - formItems.add(element5); - formItems.add(element6); - formItems.add(element7); - formItems.add(element8); - formItems.add(element9); - formItems.add(element10); - formItems.add(element11); - formItems.add(element12); - formItems.add(element13); - formItems.add(element14); - formItems.add(element15); - formItems.add(element16); - formItems.add(element17); - formItems.add(element18); - formItems.add(element19); + 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); + formBuilder.addFormElements(formItems); + subVal = Double.parseDouble(subSize.getValue()); + 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()); + + + } + 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()); + + + } } \ No newline at end of file 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 e6487c2..a31a832 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java @@ -11,7 +11,9 @@ import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.RecyclerView; + import com.addisonelliott.segmentedbutton.SegmentedButton; + import com.sf.stormwaterutilityandroid.R; import com.sf.stormwaterutilityandroid.SampleFordm; @@ -134,6 +136,8 @@ public void onClick(View v) { setupFormHQ(); } }); + + return root; } diff --git a/app/src/main/res/layout/activity_sample_fordm.xml b/app/src/main/res/layout/activity_sample_fordm.xml index bab35dc..7b0f1ef 100644 --- a/app/src/main/res/layout/activity_sample_fordm.xml +++ b/app/src/main/res/layout/activity_sample_fordm.xml @@ -5,9 +5,27 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".SampleFordm"> + + android:id="@+id/recyclerView2" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_marginBottom="10dp" + app:layout_constraintBottom_toTopOf="@+id/submitButton" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + +