finished reports, fixed nav problem

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

Hide file tree

Showing 6 changed files with 19 additions and 3 deletions.
diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/ReportAdapter.java b/app/src/main/java/com/sf/stormwaterutilityandroid/ReportAdapter.java
@@ -11,6 +11,7 @@
 import com.sf.stormwaterutilityandroid.WaterWay.WaterWay;
 import com.sf.stormwaterutilityandroid.WaterWay.WaterWayReport;
 
+import java.io.Serializable;
 import java.util.List;
 
 public class ReportAdapter extends RecyclerView.Adapter<ReportAdapter.MyHolder>{
@@ -40,7 +41,7 @@ public void onBindViewHolder(ReportAdapter.MyHolder holder, final int position)
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(v.getContext(), WaterwayReportDetail.class);
-                intent.putExtra("report",data);
+                intent.putExtra("report",new WaterWayReport(data.getH_date(),data.getH_inspector_name(),data.getH_site_name(),data.getTimeStamp(),data.getBoolFields(),data.getDoubleFields(),data.getStringFields()));
                 v.getContext().startActivity(intent);
             }
         });

diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java
@@ -47,6 +47,7 @@
 
 
 public class WaterWayFormFragment extends Fragment {
+
     //Gen Form Variable Initialization
     String nameOfInspector = "";
     String nameOfSite = "";

diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayNav.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayNav.java
@@ -32,14 +32,16 @@ public class WaterWayNav extends AppCompatActivity {
         @Override
         public boolean onNavigationItemSelected(@NonNull MenuItem item) {
             switch (item.getItemId()) {
-                case R.id.navigation_home:
+                case R.id.waterWayHome:
+                    System.out.println("Print");
                     // mTextMessage.setText(R.string.title_home);
                     fm.beginTransaction().hide(active).show(fragment1).commit();
 
                     active = fragment1;
                     fm.popBackStack();
                     return true;
                 case R.id.waterWayReports:
+                    System.out.println("Print");
                     // mTextMessage.setText(R.string.title_dashboard);
                     fm.beginTransaction().hide(active).show(fragment2).commit();
                     active = fragment2;

diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayReport.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayReport.java
@@ -33,6 +33,16 @@ public WaterWayReport(String h_date, String h_inspector_name, String h_site_name
         this.doubleFields = doubleFields;
         this.stringFields = stringFields;
     }
+    public WaterWayReport(String h_date, String h_inspector_name, String h_site_name, Date sortTimeStamp, Map<String, Boolean> boolFields, Map<String, Double> doubleFields, Map<String, String> stringFields) {
+        H_date = h_date;
+        H_inspector_name = h_inspector_name;
+        H_site_name = h_site_name;
+        timeStamp = sortTimeStamp;
+
+        this.boolFields = boolFields;
+        this.doubleFields = doubleFields;
+        this.stringFields = stringFields;
+    }
 
     public Date getTimeStamp() {
         return timeStamp;

diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayReportFragment.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayReportFragment.java
@@ -48,6 +48,8 @@
 
 
 public class WaterWayReportFragment extends Fragment {
+    public WaterWayReportFragment() {
+    }
 
     private EditText searchBar;//TODO: Make a search bar later?
     private RecyclerView recyclerView;

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