From 6765841b5446d4d2ad753f7adbc63ccce39430d2 Mon Sep 17 00:00:00 2001 From: Samuelford24 Date: Sun, 18 Apr 2021 15:22:28 -0400 Subject: [PATCH] fixed WaterWayFormFragment --- .../WaterWay/WaterWayFormFragment.java | 150 +++++++++--------- 1 file changed, 78 insertions(+), 72 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 2ee9971..9a7c4a6 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java @@ -48,10 +48,10 @@ public class WaterWayFormFragment extends Fragment { - FormElementTextSingleLine name, site, date, outfallValue, longitudeValue, latitudeValue, invertElevationValue; + FormElementTextSingleLine name, site, date, outfallValue, longitudeValue, latitudeValue, invertElevationValue,other1,other2,comments; FormElementPickerSingle subSize, smothering, silting, rootwads, overhangingVeg, oxbows, downed, shallows, waterPlants, deepPools, logs, boulders, undercutBanks, sinuosity, natural, riparianWidth, landUse, bankErosion, streamShading, deepestPool, velocityForm, riffleDepth, riffleSub; - FormElementSwitch flow, odor, color, polutants, obstruction, maintenance, screen; - FormElementTextNumber temperature, tubidity, pH, nitrate, phosphate, oxygen, coli, other1, other2, intolerant, moderatelyTolerant, fairlyTolerant, veryTolerant; + FormElementSwitch flow, odor, color, polutants, obstruction, maintenance, screen,rountineEvaluation,illicitDischarge,noIllicitDischarge,complaintInvestigation,furtherActionNeeded; + FormElementTextNumber temperature, tubidity, pH, nitrate, phosphate, oxygen, coli, intolerant, moderatelyTolerant, fairlyTolerant, veryTolerant; FormElementPickerMulti typeValue, pipeSizeValue, channelBottomWidthValue, receiving; //Gen Form Variable Initialization String nameOfInspector = ""; @@ -182,7 +182,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, boolct = false; booldws = false; boolhq = false; - boolgen = false; + boolgen = true; gen.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -315,11 +315,11 @@ public void onClick(View v) { 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)); + WaterWayBoolFields.put("FC_complaint_investigation", convertToBoolean(complaintInvestigation.getValue())); + WaterWayBoolFields.put("FC_further_action_needed", convertToBoolean(furtherActionNeeded.getValue())); + WaterWayBoolFields.put("FC_illicit_discharge_detected", convertToBoolean(illicitDischarge.getValue())); + WaterWayBoolFields.put("FC_no_illicit_discharge_detected", convertToBoolean(noIllicitDischarge.getValue())); + WaterWayBoolFields.put("FC_routine_evaluation", convertToBoolean(rountineEvaluation.getValue())); //String Fields //HEI Data @@ -356,9 +356,9 @@ public void onClick(View v) { WaterWayStringFields.put("GOD_type", type); //Comments - WaterWayStringFields.put("CS_comments", ""); - WaterWayStringFields.put("CT_other_1", ""); - WaterWayStringFields.put("CT_other_2", ""); + WaterWayStringFields.put("CS_comments", comments.getValue()); + WaterWayStringFields.put("CT_other_1", other1.getValue()); + WaterWayStringFields.put("CT_other_2", other2.getValue()); WaterWayReport wp = new WaterWayReport(dateRow,nameOfInspector,nameOfSite, null,new GeoPoint(1.23,17.),WaterWayBoolFields,WaterWayDoubleFields,WaterWayStringFields); FirebaseFirestore.getInstance().collection("Forms").document(User.agid).collection("Waterway").add(wp).addOnCompleteListener(new OnCompleteListener() { @@ -447,7 +447,7 @@ private double calculateWQI() { return WQIScore; } private void setupFormGen() { - + boolgen = true; fbGEn = new FormBuilder(getContext(), rvGen); formItemsGen = new ArrayList<>(); @@ -455,32 +455,31 @@ private void setupFormGen() { FormHeader title = (FormHeader) new FormHeader().setTitle("Report"); formItemsGen.add(title); - FormElementTextSingleLine name = FormElementTextSingleLine.createInstance().setTitle("Name of Inspector").setValue(""); + name = FormElementTextSingleLine.createInstance().setTitle("Name of Inspector").setValue(""); formItemsGen.add(name); - FormElementTextSingleLine site = FormElementTextSingleLine.createInstance().setTitle("Name of site").setValue(""); + site = FormElementTextSingleLine.createInstance().setTitle("Name of site").setValue(""); formItemsGen.add(site); FormElementPickerDate date = FormElementPickerDate.createInstance().setTitle("Date Row").setDateFormat("dd/MM/yyyy").setValue(""); formItemsGen.add(date); - FormElementTextSingleLine outfallValue = FormElementTextSingleLine.createInstance().setTitle("Outfall").setValue("0"); + outfallValue = FormElementTextSingleLine.createInstance().setTitle("Outfall").setValue("0"); formItemsGen.add(outfallValue); - FormElementTextSingleLine longitudeValue = FormElementTextSingleLine.createInstance().setTitle("Longitude").setValue("0"); + longitudeValue = FormElementTextSingleLine.createInstance().setTitle("Longitude").setValue("0"); formItemsGen.add(longitudeValue); - FormElementTextSingleLine latitudeValue = FormElementTextSingleLine.createInstance().setTitle("Latitude").setValue("0"); + latitudeValue = FormElementTextSingleLine.createInstance().setTitle("Latitude").setValue("0"); formItemsGen.add(latitudeValue); - FormElementTextSingleLine invertElevationValue = FormElementTextSingleLine.createInstance().setTitle("Invert Elevation").setValue("0"); + invertElevationValue = FormElementTextSingleLine.createInstance().setTitle("Invert Elevation").setValue("0"); 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(); + typeValue = FormElementPickerMulti.createInstance().setTitle("Type").setOptions(pipeTypeOptions); formItemsGen.add(typeValue); List pipeSizeOptions = new ArrayList(); @@ -495,8 +494,7 @@ private void setupFormGen() { pipeSizeOptions.add("20\""); pipeSizeOptions.add("24\""); pipeSizeOptions.add("36\""); - FormElementPickerMulti pipeSizeValue = FormElementPickerMulti.createInstance().setTitle("Pipe Size").setOptions(pipeSizeOptions); - pipeSize = pipeSizeValue.getValue(); + pipeSizeValue = FormElementPickerMulti.createInstance().setTitle("Pipe Size").setOptions(pipeSizeOptions); formItemsGen.add(pipeSizeValue); List channelWidthOptions = new ArrayList(); @@ -510,9 +508,8 @@ private void setupFormGen() { channelWidthOptions.add("16\""); channelWidthOptions.add("18\""); channelWidthOptions.add("20\""); - FormElementPickerMulti channelBottomWidthValue = FormElementPickerMulti.createInstance().setTitle("Channel Bottom Width") + channelBottomWidthValue = FormElementPickerMulti.createInstance().setTitle("Channel Bottom Width") .setOptions(channelWidthOptions); - channelBottomWidth = channelBottomWidthValue.getValue(); formItemsGen.add(channelBottomWidthValue); List receivingWaterOptions = new ArrayList(); @@ -526,10 +523,20 @@ private void setupFormGen() { receivingWaterOptions.add("Beaver Dam Ditch"); receivingWaterOptions.add("Kaiser Ditch"); - FormElementPickerMulti receiving = FormElementPickerMulti.createInstance().setTitle("Receiving Water").setOptions(receivingWaterOptions); - receivingWater = receiving.getValue(); + receiving = FormElementPickerMulti.createInstance().setTitle("Receiving Water").setOptions(receivingWaterOptions); formItemsGen.add(receiving); - + complaintInvestigation = FormElementSwitch.createInstance().setTitle("Complaint Investigation").setSwitchTexts("Yes", "No"); + furtherActionNeeded = FormElementSwitch.createInstance().setTitle("Further Action Needed").setSwitchTexts("Yes", "No"); + illicitDischarge = FormElementSwitch.createInstance().setTitle("Illicit Discharge Detected").setSwitchTexts("Yes", "No"); + noIllicitDischarge = FormElementSwitch.createInstance().setTitle("No Illicit Discharge").setSwitchTexts("Yes", "No"); + rountineEvaluation = FormElementSwitch.createInstance().setTitle("Rountine Evaluation").setSwitchTexts("Yes", "No"); + comments = FormElementTextSingleLine.createInstance().setTitle("Comments"); + formItemsGen.add(complaintInvestigation); + formItemsGen.add(furtherActionNeeded); + formItemsGen.add(illicitDischarge); + formItemsGen.add(noIllicitDischarge); + formItemsGen.add(rountineEvaluation); + formItemsGen.add(comments); fbGEn.addFormElements(formItemsGen); } private void setupFormHQ() { @@ -541,7 +548,7 @@ private void setupFormHQ() { 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"); + 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"); @@ -610,28 +617,28 @@ private void setupFormHQ() { 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"); - 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"); - 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"); + smothering = FormElementPickerSingle.createInstance().setTitle("Smothering").setOptions(array_yesNo5).setPickerTitle("Pick one option"); + silting = FormElementPickerSingle.createInstance().setTitle("Silting").setOptions(array_yesNo5).setPickerTitle("Pick one option"); + rootwads = FormElementPickerSingle.createInstance().setTitle("Rootwads").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + overhangingVeg = FormElementPickerSingle.createInstance().setTitle("Overhanging Veg.").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + oxbows = FormElementPickerSingle.createInstance().setTitle("Oxbows/Black Waters").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + downed = FormElementPickerSingle.createInstance().setTitle("Downed Trees/Logs").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + shallows = FormElementPickerSingle.createInstance().setTitle("Shallows (slow water)").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + waterPlants = FormElementPickerSingle.createInstance().setTitle("Water Plants").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + deepPools = FormElementPickerSingle.createInstance().setTitle("Deep Pools").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + logs = FormElementPickerSingle.createInstance().setTitle("Logs/Woody Debris").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + boulders = FormElementPickerSingle.createInstance().setTitle("Boulders").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + undercutBanks = FormElementPickerSingle.createInstance().setTitle("Undercut Banks").setOptions(array_yesNo2).setPickerTitle("Pick one option"); + sinuosity = FormElementPickerSingle.createInstance().setTitle("Sinuosity").setOptions(array_sinuosity).setPickerTitle("Pick one option"); + natural = FormElementPickerSingle.createInstance().setTitle("Natural").setOptions(array_natural).setPickerTitle("Pick one option"); + riparianWidth = FormElementPickerSingle.createInstance().setTitle("Riparian Width").setOptions(array_riparian).setPickerTitle("Pick one option"); + landUse = FormElementPickerSingle.createInstance().setTitle("Land Use").setOptions(array_landUse).setPickerTitle("Pick one option"); + bankErosion = FormElementPickerSingle.createInstance().setTitle("Bank Erosion").setOptions(array_bankErosion).setPickerTitle("Pick one option"); + streamShading = FormElementPickerSingle.createInstance().setTitle("Stream Shading").setOptions(array_streamShading).setPickerTitle("Pick one option"); + deepestPool = FormElementPickerSingle.createInstance().setTitle("Deepest Pool").setOptions(array_deepestPool).setPickerTitle("Pick one option"); + velocityForm = FormElementPickerSingle.createInstance().setTitle("Velocity").setOptions(array_velocity).setPickerTitle("Pick one option"); + riffleDepth = FormElementPickerSingle.createInstance().setTitle("Riffle/Run Depth").setOptions(array_riffleDepth).setPickerTitle("Pick one option"); + riffleSub = FormElementPickerSingle.createInstance().setTitle("Riffle/Run Substrate").setOptions(array_riffleSub).setPickerTitle("Pick one option"); List formItems = new ArrayList<>(); formItems.add(subSize); formItems.add(smothering); @@ -659,7 +666,6 @@ private void setupFormHQ() { fbHQ.addFormElements(formItems); } - private double pickerValue(FormElementPickerSingle var){ int index = var.getValue().indexOf(":"); double pickerOption; @@ -680,24 +686,24 @@ private void setupFormDWS() { FormHeader title = (FormHeader) new FormHeader().setTitle("Dry Weather Screening"); - FormElementSwitch flow = FormElementSwitch.createInstance().setTitle("Presence of Flow").setSwitchTexts("Yes", "No"); + flow = FormElementSwitch.createInstance().setTitle("Presence of Flow").setSwitchTexts("Yes", "No"); - FormElementSwitch odor = FormElementSwitch.createInstance().setTitle("Unusual Odor").setSwitchTexts("Yes", "No"); + odor = FormElementSwitch.createInstance().setTitle("Unusual Odor").setSwitchTexts("Yes", "No"); - FormElementSwitch color = FormElementSwitch.createInstance().setTitle("Unusual Color").setSwitchTexts("Yes", "No"); + color = FormElementSwitch.createInstance().setTitle("Unusual Color").setSwitchTexts("Yes", "No"); - FormElementSwitch polutants = FormElementSwitch.createInstance().setTitle("Polutants Nearby").setSwitchTexts("Yes", "No"); + polutants = FormElementSwitch.createInstance().setTitle("Polutants Nearby").setSwitchTexts("Yes", "No"); - FormElementSwitch obstruction = FormElementSwitch.createInstance().setTitle("Obstruction").setSwitchTexts("Yes", "No"); + obstruction = FormElementSwitch.createInstance().setTitle("Obstruction").setSwitchTexts("Yes", "No"); - FormElementSwitch maintenance = FormElementSwitch.createInstance().setTitle("Needs Maintenance").setSwitchTexts("Yes", "No"); + maintenance = FormElementSwitch.createInstance().setTitle("Needs Maintenance").setSwitchTexts("Yes", "No"); - FormElementSwitch screen = FormElementSwitch.createInstance().setTitle("Screen OK").setSwitchTexts("Yes", "No"); + screen = FormElementSwitch.createInstance().setTitle("Screen OK").setSwitchTexts("Yes", "No"); formItemsDWS = new ArrayList<>(); @@ -720,25 +726,25 @@ private void setupFormCT() { FormHeader title = (FormHeader) new FormHeader().setTitle("Chemical Testing"); - FormElementTextNumber temperature = new FormElementTextNumber().createInstance().setTitle("Temperature (C) Change").setValue("0"); + temperature = new FormElementTextNumber().createInstance().setTitle("Temperature (C) Change").setValue("0"); - FormElementTextNumber tubidity = new FormElementTextNumber().createInstance().setTitle("Tubidity (NTU)").setValue("0"); + tubidity = new FormElementTextNumber().createInstance().setTitle("Tubidity (NTU)").setValue("0"); - FormElementTextNumber pH = new FormElementTextNumber().createInstance().setTitle("pH").setValue("0"); + pH = new FormElementTextNumber().createInstance().setTitle("pH").setValue("0"); - FormElementTextNumber nitrate = new FormElementTextNumber().createInstance().setTitle("Nitrate (mg/L)").setValue("0"); + nitrate = new FormElementTextNumber().createInstance().setTitle("Nitrate (mg/L)").setValue("0"); - FormElementTextNumber phosphate = new FormElementTextNumber().createInstance().setTitle("Total Phosphate (mg/L)").setValue("0"); + phosphate = new FormElementTextNumber().createInstance().setTitle("Total Phosphate (mg/L)").setValue("0"); - FormElementTextNumber oxygen = new FormElementTextNumber().createInstance().setTitle("Dissolved Oxygen (mg/L)").setValue("0"); + oxygen = new FormElementTextNumber().createInstance().setTitle("Dissolved Oxygen (mg/L)").setValue("0"); - FormElementTextNumber coli = new FormElementTextNumber().createInstance().setTitle("E Coli (col/100mL)").setValue("0"); + coli = new FormElementTextNumber().createInstance().setTitle("E Coli (col/100mL)").setValue("0"); - FormElementTextSingleLine other1 = new FormElementTextSingleLine().createInstance().setTitle("Other 1").setValue(""); + other1 = new FormElementTextSingleLine().createInstance().setTitle("Other 1").setValue(""); - FormElementTextSingleLine other2 = new FormElementTextSingleLine().createInstance().setTitle("Other 2").setValue(""); + other2 = new FormElementTextSingleLine().createInstance().setTitle("Other 2").setValue(""); formItemsCT = new ArrayList<>(); @@ -759,10 +765,10 @@ 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"); + intolerant = FormElementTextNumber.createInstance().setTitle("Intolerant").setValue("0"); + moderatelyTolerant = FormElementTextNumber.createInstance().setTitle("Moderately Tolerant").setValue("0"); + fairlyTolerant = FormElementTextNumber.createInstance().setTitle("Fairly Tolerant").setValue("0"); + veryTolerant = FormElementTextNumber.createInstance().setTitle("Very Tolerant").setValue("0"); List formItemsBM = new ArrayList<>(); formItemsBM.add(intolerant);