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) {