Fixed extra fields

EPICSGroup · Mar 26, 2021 · bb28e54 · bb28e54
1 parent f19c6c6
commit bb28e54
Showing 1 changed file with 14 additions and 29 deletions.
diff --git 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<BaseFormElement> 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);
     }