Merge pull request #9 from EPICSGroup/Samuel

fixed bugs

app/google-services.json

@@ -0,0 +1,47 @@
+{
+  "project_info": {
+    "project_number": "667793859590",
+    "firebase_url": "https://aquasource-f5e44.firebaseio.com",
+    "project_id": "aquasource-f5e44",
+    "storage_bucket": "aquasource-f5e44.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:667793859590:android:8b4d04aebf855291eb8f87",
+        "android_client_info": {
+          "package_name": "com.sf.stormwaterutilityandroid"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "667793859590-o1vcunhlqe559bvuuetrkj6hels7bisl.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDbkcA22JD0-r8h4Xu6dcMGMwHpSKyvFc8"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "667793859590-o1vcunhlqe559bvuuetrkj6hels7bisl.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "667793859590-kstclkrr6eial9patuhafmclk7p34re2.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "EPICS.StormWaterUtility"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

app/src/main/java/com/sf/stormwaterutilityandroid/Construction/ConstructionReportsFragment.java

@@ -1,25 +1,112 @@
 package com.sf.stormwaterutilityandroid.Construction;
 
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.firebase.firestore.DocumentSnapshot;
+import com.google.firebase.firestore.EventListener;
+import com.google.firebase.firestore.FirebaseFirestore;
+import com.google.firebase.firestore.FirebaseFirestoreException;
+import com.google.firebase.firestore.Query;
+import com.google.firebase.firestore.QuerySnapshot;
+
+import com.sf.stormwaterutilityandroid.ConstructionFormData;
+import com.sf.stormwaterutilityandroid.ConstructionReportAdapter;
 import com.sf.stormwaterutilityandroid.R;
 
+
+import java.util.ArrayList;
+import java.util.List;
+
 public class ConstructionReportsFragment extends Fragment {
+    private EditText searchBar;
+    private RecyclerView recyclerView;
+    private Button btnSiteName, btnDate, btnInspectorName;
+    //TODO: Need vars for formdata
+
+    //TODO: Need a var for tvReports: UITableView!
+    List<ConstructionFormData> reportList = new ArrayList<>();
+    //TODO: LayoutInflator inflater, ViewGroup container,Might  not be needed
+    //This was a public void
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        View view = inflater.inflate(R.layout.activity_reports, container, false);
+        recyclerView = view.findViewById(R.id.recyclerView);
+
+
+
+        btnSiteName = view.findViewById(R.id.btn_site_name);
+        btnDate = view.findViewById(R.id.btn_date);
+        btnInspectorName = view.findViewById(R.id.btn_inspector_name);
+        searchBar = view.findViewById(R.id.searchView);
+        recyclerView = view.findViewById(R.id.recyclerView);
+
+        fetchData();
 
+        btnSiteName.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //startActivity(new Intent(Reports.this, Site_name.class));
 
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             ViewGroup container, Bundle savedInstanceState) {
-        View root = inflater.inflate(R.layout.fragment_dashboard, container, false);
-        final TextView textView = root.findViewById(R.id.text_dashboard);
-        return root;
+            }
+        });
+
+        btnDate.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //startActivity(new Intent(Reports.this, Date.class));
+            }
+        });
+
+        btnInspectorName.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //startActivity(new Intent(Reports.this, Inspector_name.class));
+            }
+        });
+
+        return view;
+
+
+
+    }
+    public void fetchData() {
+        final ConstructionReportAdapter reporter = new ConstructionReportAdapter(reportList);
+        FirebaseFirestore.getInstance().collection("ConstructionForms").orderBy("SortTimeStamp", Query.Direction.DESCENDING).addSnapshotListener(new EventListener<QuerySnapshot>() {
+            @Override
+            public void onEvent(@javax.annotation.Nullable QuerySnapshot queryDocumentSnapshots, @javax.annotation.Nullable FirebaseFirestoreException e) {
+                if (e != null) {
+                    Log.i("Error", "No data");
+                }
+                reportList.clear();
+                for (DocumentSnapshot d:queryDocumentSnapshots){
+                    //needs to be changed to waterway data type
+                    reportList.add(  d.toObject(ConstructionFormData.class));
+                }
+
+                reporter.notifyDataSetChanged();
+            }
+        });
+        RecyclerView.LayoutManager layoutmanager = new LinearLayoutManager(getContext());
+        recyclerView.setLayoutManager(layoutmanager);
+        recyclerView.setItemAnimator(new DefaultItemAnimator());
+        recyclerView.setAdapter(reporter);
     }
+
 }

app/src/main/java/com/sf/stormwaterutilityandroid/ConstructionReportAdapter.java

@@ -0,0 +1,61 @@
+package com.sf.stormwaterutilityandroid;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.List;
+
+public class ConstructionReportAdapter extends RecyclerView.Adapter<ConstructionReportAdapter.MyHolder>{
+    //needs changed to waterway
+    List<ConstructionFormData> listdata;
+
+    public ConstructionReportAdapter(List<ConstructionFormData> listdata) {
+        this.listdata = listdata;
+    }
+
+    @Override
+    public ConstructionReportAdapter.MyHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.cardview_reports,parent,false);
+
+        ConstructionReportAdapter.MyHolder myHolder = new ConstructionReportAdapter.MyHolder(view);
+        return myHolder;
+    }
+
+
+    public void onBindViewHolder(ConstructionReportAdapter.MyHolder holder, final int position) {
+
+        final ConstructionFormData data = listdata.get(position);
+        //holder.inspectorName.setText(data.getInspectorName());
+      //  holder.site.setText(data.getSite());
+      //  holder.date.setText((CharSequence) data.getDate());
+
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return listdata.size();
+    }
+
+
+    class MyHolder extends RecyclerView.ViewHolder{
+        TextView inspectorName,site,date;
+
+        public MyHolder(View itemView) {
+            super(itemView);
+            inspectorName = (TextView) itemView.findViewById(R.id.inspectorName);
+            site = (TextView) itemView.findViewById(R.id.siteName);
+            date = (TextView) itemView.findViewById(R.id.date);
+        }
+    }
+
+
+}
+
+
+

app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java

@@ -23,6 +23,7 @@
 import me.riddhimanadib.formmaster.model.FormElementTextSingleLine;
 import me.riddhimanadib.formmaster.model.FormHeader;
 
+
 public class DryWeatherScreening extends AppCompatActivity{
 
     private FormBuilder formBuilder;
@@ -80,4 +81,4 @@ private void setupForm() {
 
         formBuilder.addFormElements(formItems);
     }
-}
+}

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_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;
     }
 
+
 }
+

app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java

@@ -32,7 +32,8 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_sample_fordm);
         recyclerView = findViewById(R.id.recyclerView2);
 
-        submitButton = findViewById(R.id.submitButton);
+       // submitButton = findViewById(R.id.submitButton);
+
 
         setupForm();
     }

app/src/main/java/com/sf/stormwaterutilityandroid/ReportAdapter.java

@@ -0,0 +1,61 @@
+package com.sf.stormwaterutilityandroid;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+ public class ReportAdapter extends RecyclerView.Adapter<ReportAdapter.MyHolder>{
+
+  //  List<Report> listdata;
+
+   // public ReportAdapter(List<Report> listdata) {
+   //     this.listdata = listdata;
+   // }
+
+    @Override
+    public ReportAdapter.MyHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.cardview_reports,parent,false);
+
+        ReportAdapter.MyHolder myHolder = new ReportAdapter.MyHolder(view);
+        return myHolder;
+    }
+
+
+    public void onBindViewHolder(ReportAdapter.MyHolder holder, final int position) {
+
+       // final Report data = listdata.get(position);
+       // holder.inspectorName.setText(data.getInspectorName());
+       // holder.site.setText(data.getSite());
+       // holder.date.setText((CharSequence) data.getDate());
+
+
+    }
+
+     @Override
+     public int getItemCount() {
+         return 0;
+     }
+
+     // @Override
+   // public int getItemCount() {
+     //   return listdata.size();
+    //}
+
+
+    class MyHolder extends RecyclerView.ViewHolder{
+        TextView inspectorName,site,date;
+
+        public MyHolder(View itemView) {
+            super(itemView);
+            inspectorName = (TextView) itemView.findViewById(R.id.inspectorName);
+            site = (TextView) itemView.findViewById(R.id.siteName);
+            date = (TextView) itemView.findViewById(R.id.date);
+        }
+    }
+
+
+}

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;
     }
+
 }

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;
     }
+
+}
+
 }
+