From 4ff95a14475a4b49f5f917bf9ffc9735946a77ce Mon Sep 17 00:00:00 2001
From: sakthiarajapandian27 <s224789408@deakin.edu.au>
Date: Fri, 3 Apr 2026 20:50:05 +1100
Subject: [PATCH] bug fix

---
 .../dailyreport/DailyReportActivity.java      | 65 ++++++++++++++-----
 1 file changed, 47 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/deakin/gopher/guardian/view/patient/dailyreport/DailyReportActivity.java b/app/src/main/java/deakin/gopher/guardian/view/patient/dailyreport/DailyReportActivity.java
index 44b42c62a..cbd9f4ac2 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/patient/dailyreport/DailyReportActivity.java
+++ b/app/src/main/java/deakin/gopher/guardian/view/patient/dailyreport/DailyReportActivity.java
@@ -1,8 +1,12 @@
 package deakin.gopher.guardian.view.patient.dailyreport;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.widget.ImageView;
 import android.widget.TextView;
+import deakin.gopher.guardian.view.general.Homepage4admin;
+import deakin.gopher.guardian.view.general.Homepage4caretaker;
+import deakin.gopher.guardian.view.general.LoginActivity;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
@@ -11,30 +15,55 @@
 
 public class DailyReportActivity extends AppCompatActivity {
 
-  ImageView dailyReportMenuButton;
+    ImageView dailyReportMenuButton;
 
-  @Override
-  protected void onCreate(final Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_daily_report);
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_daily_report);
 
-    final NavigationView navigationView = findViewById(R.id.nav_view);
-    dailyReportMenuButton = findViewById(R.id.menuButton11);
-    final DrawerLayout drawerLayout = findViewById(R.id.drawer_layout);
-    navigationView.setItemIconTintList(null);
+        final NavigationView navigationView = findViewById(R.id.nav_view);
+        dailyReportMenuButton = findViewById(R.id.menuButton11);
+        final DrawerLayout drawerLayout = findViewById(R.id.drawer_layout);
+        navigationView.setItemIconTintList(null);
 
-    dailyReportMenuButton.setOnClickListener(
-        v -> {
-          drawerLayout.openDrawer(GravityCompat.START);
-        });
+        navigationView.setNavigationItemSelectedListener(
+                menuItem -> {
+                    Intent intent = null;
+                    final int itemId = menuItem.getItemId();
+                    if (itemId == R.id.nav_home) {
+                        final boolean isAdmin = deakin.gopher.guardian.model.login.SessionManager.INSTANCE.getCurrentUser().getRole() instanceof deakin.gopher.guardian.model.login.Role.Admin;
+                        intent = new Intent(DailyReportActivity.this, isAdmin ? Homepage4admin.class : Homepage4caretaker.class);
+                    } else if (itemId == R.id.nav_signout) {
+                        com.google.firebase.auth.FirebaseAuth.getInstance().signOut();
+                        intent = new Intent(DailyReportActivity.this, LoginActivity.class);
+                        startActivity(intent);
+                        finish();
+                        return true;
+                    }
 
-    final String patientNameExtra = getIntent().getStringExtra("patientName");
-    final String patientName = patientNameExtra != null ? patientNameExtra.split(" ")[0] : "";
+                    if (intent != null) {
+                        startActivity(intent);
+                    }
 
-    final TextView usernameTextView = findViewById(R.id.username);
+                    if (null != drawerLayout) {
+                        drawerLayout.closeDrawer(GravityCompat.START);
+                    }
+                    return true;
+                });
+
+        dailyReportMenuButton.setOnClickListener(
+                v -> {
+                    drawerLayout.openDrawer(GravityCompat.START);
+                });
+
+        final String patientNameExtra = getIntent().getStringExtra("patientName");
+        final String patientName = patientNameExtra != null ? patientNameExtra.split(" ")[0] : "";
+
+        final TextView usernameTextView = findViewById(R.id.username);
 
     /*if (null != patientName) {
       usernameTextView.setText(patientName);
     }*/
-  }
-}
+    }
+}
\ No newline at end of file