working on report page

EPICSGroup · Apr 15, 2021 · e201506 · e201506
1 parent 4043c44
commit e201506
Show file tree

Hide file tree

Showing 2 changed files with 94 additions and 2 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
@@ -48,7 +48,98 @@
 
 public class WaterWayFormFragment extends Fragment {
     //Gen Form Variable Initialization
-
+    String nameOfInspector = "";
+    String nameOfSite = "";
+    String dateRow = "";
+
+    String outfall = "";
+    String longitude = "";
+    String latitude = "";
+    String invertElevation = "";
+
+    String type = "";
+    String pipeSize = "";
+    String channelBottomWidth = "";
+    String receivingWater = "";
+
+    //DWS Form Variable Initialization
+    String flowVal = "";
+    String odorVal = "";
+    String colorVal = "";
+    String polutantsVal = "";
+    String obstructionVal = "";
+    String maintenanceVal = "";
+    String screenVal = "";
+    boolean flowPres = false;
+    boolean odorPres = false;
+    boolean colorPres = false;
+    boolean polutantsPres = false;
+    boolean obstructionPres = false;
+    boolean needMaintenance = false;
+    //CT Form Variable Initialization
+    double tempVal = 0;
+    double turbidityVal = 0;
+    double phVal = 0;
+    double nitrateVal = 0;
+    double phosphateVal = 0;
+    double oxygenVal = 0;
+    double coliVal = 0;
+    String other1Val = "";
+    String other2Val = "";
+
+    //HQ Form Variable Initialization
+    String sub = "";
+    String smoth = "";
+    String silt = "";
+    String rootString = "";
+    String overVeg = "";
+    String ox = "";
+    String down = "";
+    String shallow = "";
+    String wat = "";
+    String deep = "";
+    String log = "";
+    String bould = "";
+    String under = "";
+    String sin = "";
+    String nat = "";
+    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;
+    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;
+    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;
+    double fairTolerantVal = 0.0;
+    double veryTolerantVal = 0.0;
 RecyclerView rvGen, rvDWS, rvHQ, rvBM,rvCT;
  FormBuilder fbGEn,fbDWS,fbBM,fbHQ,fbCT;
 SegmentedButton gen,dws,ct,bm,hq;
@@ -107,7 +198,7 @@ public void onClick(View v) {
            Map<String, String> WaterWayStringFields = new HashMap<String, String>();
 
                //Water Quality Index Data
-                WaterWayDoubleFields.put("CT_E_coli",formItemsCT.get());
+                WaterWayDoubleFields.put("CT_E_coli",coliVal);
                WaterWayDoubleFields.put("CT_temperature_change",tempVal );
                WaterWayDoubleFields.put("CT_turbidity", turbidityVal);
                WaterWayDoubleFields.put("CT_pH", phVal);

diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterwayReportDetail.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterwayReportDetail.java
@@ -30,6 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_waterway_report_detail);
         wp = (WaterWayReport) getIntent().getSerializableExtra("report");
+        listView.
         String[] labels =
                 {"Chemical (WQI): ",
                 "Biological (PTI): ",