Skip to content

Added Admin Dashboard Functions and Fixed Error Messages and Bugs #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ys2426 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added Admin Dashboard Functions and Fixed Error Messages and Bugs #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/src/main/java/deakin/gopher/guardian/services/EmailPasswordAuthService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class EmailPasswordAuthService(
}

companion object {
@JvmStatic
fun resetPassword(emailAddress: EmailAddress): Task<Void>? {
return try {
FirebaseAuth.getInstance().sendPasswordResetEmail(emailAddress.emailAddress)
Expand All @@ -59,6 +60,7 @@ class EmailPasswordAuthService(
}
}

@JvmStatic
fun signOut(context: Context) {
try {
SessionManager.logoutUser()
Expand Down
28 changes: 26 additions & 2 deletions ...kin/gopher/guardian/view/caretaker/notifications/confirmincident/CallAmbulanceActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ import androidx.core.view.GravityCompat
import androidx.drawerlayout.widget.DrawerLayout
import com.google.android.material.navigation.NavigationView
import deakin.gopher.guardian.R
import deakin.gopher.guardian.services.EmailPasswordAuthService
import deakin.gopher.guardian.view.general.BaseActivity
import deakin.gopher.guardian.view.general.Homepage4caretaker
import deakin.gopher.guardian.view.general.Homepage4admin

class CallAmbulanceActivity : BaseActivity() {
var hospitalSpinner: Spinner? = null
Expand All @@ -35,6 +36,29 @@ class CallAmbulanceActivity : BaseActivity() {
}
}

navigationView.setNavigationItemSelectedListener { item ->
when (item.itemId) {
R.id.nav_home -> {
startActivity(Intent(this, Homepage4admin::class.java))
finish()
true
}
R.id.nav_signout -> {
androidx.appcompat.app.AlertDialog.Builder(this)
.setTitle(R.string.sign_out)
.setMessage(R.string.sign_out_confirmation_message)
.setPositiveButton(R.string.sign_out) { _, _ ->
EmailPasswordAuthService.signOut(this)
finish()
}
.setNegativeButton(R.string.stay_in, null)
.show()
true
}
else -> false
}
}

hospitalSpinner = findViewById(R.id.hospitalSpinner)

// Create an ArrayAdapter using the string array and a default Spinner layout
Expand Down Expand Up @@ -69,7 +93,7 @@ class CallAmbulanceActivity : BaseActivity() {

fun onConfirmIncidentCancelClick(view: View?) {
val medicalDiagnosticsActivityIntent =
Intent(this@CallAmbulanceActivity, Homepage4caretaker::class.java)
Intent(this@CallAmbulanceActivity, Homepage4admin::class.java)
startActivity(medicalDiagnosticsActivityIntent)
}

Expand Down
25 changes: 25 additions & 0 deletions ...n/gopher/guardian/view/caretaker/notifications/confirmincident/ConfirmIncidentActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ import androidx.drawerlayout.widget.DrawerLayout
import androidx.media3.common.util.UnstableApi
import com.google.android.material.navigation.NavigationView
import deakin.gopher.guardian.R
import deakin.gopher.guardian.services.EmailPasswordAuthService
import deakin.gopher.guardian.view.falldetection.FallAlertActivity
import deakin.gopher.guardian.view.general.BaseActivity
import deakin.gopher.guardian.view.general.Homepage4admin

class ConfirmIncidentActivity : BaseActivity() {
var hospitalSpinner: Spinner? = null
Expand All @@ -37,6 +39,29 @@ class ConfirmIncidentActivity : BaseActivity() {
}
}

navigationView.setNavigationItemSelectedListener { item ->
when (item.itemId) {
R.id.nav_home -> {
startActivity(Intent(this, Homepage4admin::class.java))
finish()
true
}
R.id.nav_signout -> {
androidx.appcompat.app.AlertDialog.Builder(this)
.setTitle(R.string.sign_out)
.setMessage(R.string.sign_out_confirmation_message)
.setPositiveButton(R.string.sign_out) { _, _ ->
EmailPasswordAuthService.signOut(this)
finish()
}
.setNegativeButton(R.string.stay_in, null)
.show()
true
}
else -> false
}
}

hospitalSpinner = findViewById(R.id.hospitalSpinner)

// Create an ArrayAdapter using the string array and a default Spinner layout
Expand Down
36 changes: 29 additions & 7 deletions ...in/gopher/guardian/view/caretaker/notifications/falsealarm/FalseAlertConfirmedActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ import androidx.core.view.GravityCompat
import androidx.drawerlayout.widget.DrawerLayout
import com.google.android.material.navigation.NavigationView
import deakin.gopher.guardian.R
import deakin.gopher.guardian.services.EmailPasswordAuthService
import deakin.gopher.guardian.view.general.BaseActivity
import deakin.gopher.guardian.view.general.Homepage4caretaker
import deakin.gopher.guardian.view.general.Homepage4admin

class FalseAlertConfirmedActivity : BaseActivity() {
var falseAlertMenuButton: ImageView? = null
Expand All @@ -29,11 +30,32 @@ class FalseAlertConfirmedActivity : BaseActivity() {
val drawerLayout = findViewById<DrawerLayout>(R.id.drawer_layout)
navigationView.itemIconTintList = null

falseAlertMenuButton?.setOnClickListener(
View.OnClickListener { v: View? ->
drawerLayout.openDrawer(GravityCompat.START)
},
)
falseAlertMenuButton?.setOnClickListener {
drawerLayout.openDrawer(GravityCompat.START)
}

navigationView.setNavigationItemSelectedListener { item ->
when (item.itemId) {
R.id.nav_home -> {
startActivity(Intent(this, Homepage4admin::class.java))
finish()
true
}
R.id.nav_signout -> {
androidx.appcompat.app.AlertDialog.Builder(this)
.setTitle(R.string.sign_out)
.setMessage(R.string.sign_out_confirmation_message)
.setPositiveButton(R.string.sign_out) { _, _ ->
EmailPasswordAuthService.signOut(this)
finish()
}
.setNegativeButton(R.string.stay_in, null)
.show()
true
}
else -> false
}
}
}

private fun showDialog() {
Expand All @@ -43,7 +65,7 @@ class FalseAlertConfirmedActivity : BaseActivity() {
val okButtonFalseAlert = dialog.findViewById<Button>(R.id.okButtonFalseAlert)
okButtonFalseAlert.setOnClickListener { v: View? ->
val intent =
Intent(applicationContext, Homepage4caretaker::class.java)
Intent(applicationContext, Homepage4admin::class.java)
startActivity(intent)
finish()
}
Expand Down
24 changes: 22 additions & 2 deletions app/src/main/java/deakin/gopher/guardian/view/general/Homepage4admin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package deakin.gopher.guardian.view.general

import android.content.Intent
import androidx.appcompat.app.AlertDialog
import android.os.Bundle
import android.widget.Button
import deakin.gopher.guardian.R
Expand Down Expand Up @@ -56,8 +57,15 @@ class Homepage4admin : BaseActivity() {

// sign out button
signOutButton.setOnClickListener {
EmailPasswordAuthService.signOut(this)
finish()
AlertDialog.Builder(this)
.setTitle(R.string.sign_out)
.setMessage(R.string.sign_out_confirmation_message)
.setPositiveButton(R.string.sign_out) { _, _ ->
EmailPasswordAuthService.signOut(this)
finish()
}
.setNegativeButton(R.string.stay_in, null)
.show()
}

// nurse roster button
Expand All @@ -67,4 +75,16 @@ class Homepage4admin : BaseActivity() {
startActivity(nurseRosterActivityIntent)
}
}

override fun onBackPressed() {
AlertDialog.Builder(this)
.setTitle(R.string.sign_out)
.setMessage(R.string.sign_out_confirmation_message)
.setPositiveButton(R.string.sign_out) { _, _ ->
EmailPasswordAuthService.signOut(this)
finish()
}
.setNegativeButton(R.string.stay_in, null)
.show()
}
}
38 changes: 38 additions & 0 deletions app/src/main/java/deakin/gopher/guardian/view/general/NurseRosterActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,50 @@
package deakin.gopher.guardian.view.general;

import android.content.Intent;
import android.os.Bundle;
import android.widget.ImageView;
import androidx.appcompat.app.AlertDialog;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import com.google.android.material.navigation.NavigationView;
import deakin.gopher.guardian.R;
import deakin.gopher.guardian.services.EmailPasswordAuthService;

public class NurseRosterActivity extends BaseActivity {
@Override
protected void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_nurse_roster);

final NavigationView navigationView = findViewById(R.id.nav_view);
final DrawerLayout drawerLayout = findViewById(R.id.drawer_layout);
final ImageView menuButton = findViewById(R.id.menuButton);

navigationView.setItemIconTintList(null);

menuButton.setOnClickListener(v -> drawerLayout.openDrawer(GravityCompat.START));

navigationView.setNavigationItemSelectedListener(
item -> {
final int id = item.getItemId();
if (id == R.id.nav_home) {
startActivity(new Intent(NurseRosterActivity.this, Homepage4admin.class));
finish();
} else if (id == R.id.nav_signout) {
new AlertDialog.Builder(this)
.setTitle(R.string.sign_out)
.setMessage(R.string.sign_out_confirmation_message)
.setPositiveButton(
R.string.sign_out,
(dialog, which) -> {
EmailPasswordAuthService.signOut(this);
finish();
})
.setNegativeButton(R.string.stay_in, null)
.show();
}
drawerLayout.closeDrawer(GravityCompat.START);
return true;
});
}
}
25 changes: 17 additions & 8 deletions app/src/main/java/deakin/gopher/guardian/view/general/PatientProfileActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.google.firebase.database.FirebaseDatabase;
import deakin.gopher.guardian.R;
import deakin.gopher.guardian.adapter.PatientProfileAdapter;
import deakin.gopher.guardian.services.EmailPasswordAuthService;

public class PatientProfileActivity extends BaseActivity {

Expand Down Expand Up @@ -79,15 +80,9 @@ protected void onCreate(final Bundle savedInstanceState) {
final int id = menuItem.getItemId();
if (R.id.nav_home == id) {
startActivity(new Intent(PatientProfileActivity.this, Homepage4admin.class));

} /*else if (R.id.nav_admin == id) {
startActivity(new Intent(PatientProfileActivity.this, Homepage4admin.class));
} else if (R.id.nav_settings == id) {
startActivity(new Intent(PatientProfileActivity.this, Setting.class));
}*/ else if (R.id.nav_signout == id) {
mAuth.getInstance().signOut();
startActivity(new Intent(PatientProfileActivity.this, LoginActivity.class));
finish();
} else if (R.id.nav_signout == id) {
showSignOutConfirmationDialog();
}
return true;
});
Expand Down Expand Up @@ -173,4 +168,18 @@ private void deletePatient(String patientId) {
PatientProfileActivity.this, "Failed to delete patient", Toast.LENGTH_SHORT)
.show());
}

private void showSignOutConfirmationDialog() {
new androidx.appcompat.app.AlertDialog.Builder(this)
.setTitle(R.string.sign_out)
.setMessage(R.string.sign_out_confirmation_message)
.setPositiveButton(
R.string.sign_out,
(dialog, which) -> {
EmailPasswordAuthService.signOut(this);
finish();
})
.setNegativeButton(R.string.stay_in, null)
.show();
}
}
31 changes: 31 additions & 0 deletions app/src/main/java/deakin/gopher/guardian/view/general/PatientProfileAddActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import deakin.gopher.guardian.model.MedicalDiagnostic;
import deakin.gopher.guardian.model.NextOfKin;
import deakin.gopher.guardian.model.PatientOldArchive;
import deakin.gopher.guardian.services.EmailPasswordAuthService;
import deakin.gopher.guardian.util.DataListener;

public class PatientProfileAddActivity extends BaseActivity implements DataListener {
Expand Down Expand Up @@ -47,6 +48,22 @@ protected void onCreate(final Bundle savedInstanceState) {
customHeader.setHeaderTopImage(R.drawable.add_image_button);

navigationView.setItemIconTintList(null);
navigationView.setNavigationItemSelectedListener(
item -> {
final int itemId = item.getItemId();
if (itemId == R.id.nav_home) {
startActivity(new Intent(PatientProfileAddActivity.this, Homepage4admin.class));
finish();
drawerLayout.closeDrawer(GravityCompat.START);
return true;
} else if (itemId == R.id.nav_signout) {
showSignOutConfirmationDialog();
drawerLayout.closeDrawer(GravityCompat.START);
return true;
}
drawerLayout.closeDrawer(GravityCompat.START);
return false;
});

if (null != customHeader) {
customHeader.menuButton.setOnClickListener(
Expand Down Expand Up @@ -251,4 +268,18 @@ private void createMedicalDiagnostic(final String patient_id) {
Toast.LENGTH_SHORT)
.show());
}

private void showSignOutConfirmationDialog() {
final AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.sign_out);
builder.setMessage(R.string.sign_out_confirmation_message);
builder.setPositiveButton(
R.string.sign_out,
(dialog, which) -> {
EmailPasswordAuthService.signOut(this);
finish();
});
builder.setNegativeButton(R.string.stay_in, null);
builder.show();
}
}
Loading
Loading