Skip to content
This repository was archived by the owner on Sep 22, 2025. It is now read-only.

all the tasks done #366

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

all the tasks done #366

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
3 changes: 1 addition & 2 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
# This configuration is used by ktlint when spotless invokes it

[*.{kt,kts}]
ktlint_function_naming_ignore_when_annotated_with=Composable, Test
ktlint_disabled_rules=no-wildcard-imports

273 changes: 82 additions & 191 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,17 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-feature
android:name="android.hardware.camera"
android:required="false" />
<!-- Features -->
<uses-feature android:name="android.hardware.camera" android:required="false" />

<!-- Permissions -->
<uses-permission android:name="android.permission.INTERNET" />
<!-- For reading images -->
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />

<!-- For reading videos -->
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.CAMERA" />


<!-- For reading audio -->
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />

<!-- Add WRITE permissions only if necessary -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
<!-- Add the permission here -->
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28"/>
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

<application
Expand All @@ -35,197 +27,96 @@
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true"
tools:replace="android:allowBackup,android:label"
tools:targetApi="31"
tools:ignore="ExtraText">
<activity
android:name=".WelcomeActivity"
android:exported="false" />
<activity
android:name=".TrainingActivity"
android:exported="false" />
<activity
android:name=".Training2"
android:exported="false"></activity>
<activity
android:name=".Training"
android:exported="false" />
<activity
android:name=".view.patient.patientdata.heartrate.HeartRateActivity"
tools:targetApi="31">

<!-- FileProvider for Camera/Gallery -->
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.provider"
android:exported="false"
android:label="@string/title_activity_heart_rate"
android:theme="@style/Theme.TeamGuardians" />
<activity
android:name=".view.general.Setting"
android:exported="false" />
<activity
android:name=".view.general.PatientProfileAddActivity"
android:exported="false" />
<activity
android:name=".view.general.Homepage4admin"
android:exported="false" />
<activity
android:name=".view.general.Homepage4caretaker"
android:exported="false" />
<activity
android:name=".view.general.Homepage4nurse"
android:exported="false" />
<activity
android:name=".view.general.TaskDetailActivity"
android:exported="false" />
<activity
android:name=".view.general.TaskAddActivity"
android:exported="false" />
<activity
android:name=".view.general.UploadPhoto"
android:exported="false" />
<activity
android:name=".view.caretaker.notifications.falsealarm.FalseAlertConfirmedActivity"
android:exported="false" />
<activity
android:name=".view.caretaker.notifications.confirmincident.ConfirmIncidentActivity"
android:exported="false" />
<activity
android:name=".view.caretaker.CaretakerDashboardActivity"
android:exported="false" />
<activity
android:name=".view.caretaker.CaretakerProfileActivity"
android:exported="false" />
<activity
android:name=".view.caretaker.EditCaretakerProfileActivity"
android:exported="false" />
<activity
android:name=".view.patient.patientdata.healthdata.HealthDataActivity"
android:exported="false" />
<activity
android:name=".view.patient.associateradar.ActivitySuggestionActivity"
android:exported="false" />
<activity
android:name=".view.general.PatientProfileActivity"
android:exported="false" />
<activity
android:name=".view.general.ArchivedPatientListActivity"
android:exported="false" />
<activity
android:name=".view.patient.viewactivitydata.WeeklyActivityProfilingActivity"
android:exported="false">
android:grantUriPermissions="true">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".view.patient.associateradar.ActivityProfilingActivity"
android:exported="false">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".view.patient.careplan.CarePlanSummaryActivity"
android:exported="false">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".view.patient.careplan.CarePlanActivity"
android:exported="false" />
<activity
android:name=".view.patient.dailyreport.DailyReportSummaryActivity"
android:exported="false">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".view.patient.dailyreport.DailyReportActivity"
android:exported="false">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".view.general.PatientListActivity"
android:exported="false" />
<activity
android:name=".view.general.PatientDetailsActivity"
android:exported="false" />
<activity
android:name=".view.general.AddPatientLogActivity"
android:exported="false" />
<activity
android:name=".view.general.RegisterActivity"
android:exported="false" />
<activity
android:name=".view.general.LoginActivity"
android:exported="false" />
<activity android:name=".view.general.PinCodeActivity"
android:exported="false" />
<activity
android:name=".view.general.AddNewPatientActivity"
android:exported="false" /> <!-- Kussay: may we need to change the start up page into login page -->
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>

<!-- Launcher Activity -->
<activity
android:name=".view.general.MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity> <!-- These are here only for UI testing -->
<activity
android:name=".view.patient.patientdata.medicaldiagnostics.MedicalDiagnosticsActivity"
android:exported="false" />
<activity
android:name=".view.general.DrawerActivity"
android:exported="false" />
<activity
android:name=".view.patient.PatientDashboardActivity"
android:exported="false" />
<activity
android:name=".view.general.TasksListActivity"
android:exported="false" />

<activity android:name=".ModulesActivity" />


<activity android:name=".Module1CoursesActivity" />
<activity android:name=".HomecareInductionActivity" />
<activity android:name=".InfectionControlActivity" />
<activity android:name=".SupportingMealtimesActivity" />


<activity android:name=".Module2CoursesActivity" />
<activity android:name=".MedicationTechniqueActivity" />
<activity android:name=".MedicationSafetyActivity" />


<activity android:name=".Module3CoursesActivity" />
<activity android:name=".InspiringLeadershipEIActivity" />
<activity android:name=".EmotionalIntelligenceCommunicationActivity" />
<activity android:name="deakin.gopher.guardian.view.general.NurseRosterActivity" />
<activity android:name=".view.falldetection.FallDetectionActivity" />
<activity android:name=".view.falldetection.FallAlertActivity" />
<activity android:name="deakin.gopher.guardian.view.caretaker.notifications.confirmincident.CallAmbulanceActivity" />

<activity
android:name=".PatientExerciseModules"
android:exported="false"
android:label="Patient Exercise Modules" />

</activity>

<service
android:name=".model.FirebaseMessagingService"
android:exported="false">
<!-- Other activities -->
<activity android:name=".WelcomeActivity" android:exported="false" />
<activity android:name=".TrainingActivity" android:exported="false" />
<activity android:name=".Training2" android:exported="false" />
<activity android:name=".Training" android:exported="false" />
<activity android:name=".view.patient.patientdata.heartrate.HeartRateActivity" android:exported="false" />
<activity android:name=".view.general.Setting" android:exported="false" />
<activity android:name=".view.general.PatientProfileAddActivity" android:exported="false" />
<activity android:name=".view.general.Homepage4admin" android:exported="false" />
<activity android:name=".view.general.Homepage4caretaker" android:exported="false" />
<activity android:name=".view.general.Homepage4nurse" android:exported="false" />
<activity android:name=".view.general.TaskDetailActivity" android:exported="false" />
<activity android:name=".view.general.TaskAddActivity" android:exported="false" />
<activity android:name=".view.general.UploadPhoto" android:exported="false" />
<activity android:name=".view.caretaker.notifications.falsealarm.FalseAlertConfirmedActivity" android:exported="false" />
<activity android:name=".view.caretaker.notifications.confirmincident.ConfirmIncidentActivity" android:exported="false" />
<activity android:name=".view.caretaker.CaretakerDashboardActivity" android:exported="false" />
<activity android:name=".view.caretaker.CaretakerProfileActivity" android:exported="false" />
<activity android:name=".view.caretaker.EditCaretakerProfileActivity" android:exported="false" />
<activity android:name=".view.patient.patientdata.healthdata.HealthDataActivity" android:exported="false" />
<activity android:name=".view.patient.associateradar.ActivitySuggestionActivity" android:exported="false" />
<activity android:name=".view.general.PatientProfileActivity" android:exported="false" />
<activity android:name=".view.general.ArchivedPatientListActivity" android:exported="false" />
<activity android:name=".view.patient.viewactivitydata.WeeklyActivityProfilingActivity" android:exported="false" />
<activity android:name=".view.patient.associateradar.ActivityProfilingActivity" android:exported="false" />
<activity android:name=".view.patient.careplan.CarePlanSummaryActivity" android:exported="false" />
<activity android:name=".view.patient.careplan.CarePlanActivity" android:exported="false" />
<activity android:name=".view.patient.dailyreport.DailyReportSummaryActivity" android:exported="false" />
<activity android:name=".view.patient.dailyreport.DailyReportActivity" android:exported="false" />
<activity android:name=".view.general.PatientListActivity" android:exported="false" />
<activity android:name=".view.general.PatientDetailsActivity" android:exported="false" />
<activity android:name=".view.general.AddPatientLogActivity" android:exported="false" />
<activity android:name=".view.general.RegisterActivity" android:exported="false" />
<activity android:name=".view.general.LoginActivity" android:exported="false" />
<activity android:name=".view.general.PinCodeActivity" android:exported="false" />
<activity android:name=".view.general.AddNewPatientActivity" android:exported="false" />
<activity android:name=".ModulesActivity" android:exported="false" />
<activity android:name=".Module1CoursesActivity" android:exported="false" />
<activity android:name=".Module2CoursesActivity" android:exported="false" />
<activity android:name=".Module3CoursesActivity" android:exported="false" />
<activity android:name=".HomecareInductionActivity" android:exported="false" />
<activity android:name=".InfectionControlActivity" android:exported="false" />
<activity android:name=".SupportingMealtimesActivity" android:exported="false" />
<activity android:name=".MedicationTechniqueActivity" android:exported="false" />
<activity android:name=".MedicationSafetyActivity" android:exported="false" />
<activity android:name=".InspiringLeadershipEIActivity" android:exported="false" />
<activity android:name=".EmotionalIntelligenceCommunicationActivity" android:exported="false" />
<activity android:name="deakin.gopher.guardian.view.general.NurseRosterActivity" android:exported="false" />
<activity android:name=".view.falldetection.FallDetectionActivity" android:exported="false" />
<activity android:name=".view.falldetection.FallAlertActivity" android:exported="false" />
<activity android:name="deakin.gopher.guardian.view.caretaker.notifications.confirmincident.CallAmbulanceActivity" android:exported="false" />
<activity android:name=".PatientExerciseModules" android:exported="false" />
<activity android:name=".view.general.DashboardActivity" android:exported="false" />
<activity android:name=".view.general.AssignNurseActivity" />
<activity android:name=".view.general.EditPatientActivity" />


<!-- Firebase Service -->
<service android:name=".model.FirebaseMessagingService" android:exported="false">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT" />
</intent-filter>
</service>

<meta-data
android:name="preloaded_fonts"
android:resource="@array/preloaded_fonts" />
<!-- Fonts -->
<meta-data android:name="preloaded_fonts" android:resource="@array/preloaded_fonts" />

<activity android:name=".view.general.DashboardActivity"/>
</application>

</manifest>
</manifest>
2 changes: 1 addition & 1 deletion app/src/main/java/deakin/gopher/guardian/ActivityLogScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import androidx.navigation.NavController

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun ActivityLogScreen(navController: NavController) {
fun activityLogScreen(navController: NavController) {
Scaffold(
topBar = {
TopAppBar(
Expand Down
17 changes: 11 additions & 6 deletions app/src/main/java/deakin/gopher/guardian/adapter/PatientListAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ import deakin.gopher.guardian.model.Patient

class PatientListAdapter(
private var patients: List<Patient>,
private val onPatientClick: ((Patient) -> Unit)? = null,
private val onAssignNurseClick: ((Patient) -> Unit)? = null,
private val onDeleteClick: ((Patient) -> Unit)? = null,
private val onPatientClick: (Patient) -> Unit,
private val onAssignNurseClick: (Patient) -> Unit,
private val onEditClick: (Patient) -> Unit,
private val onDeleteClick: (Patient) -> Unit,
) : RecyclerView.Adapter<PatientListAdapter.PatientViewHolder>() {
inner class PatientViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
val nameText: TextView = itemView.findViewById(R.id.tvName)
Expand Down Expand Up @@ -68,11 +69,15 @@ class PatientListAdapter(
popupMenu.setOnMenuItemClickListener { menuItem ->
when (menuItem.itemId) {
R.id.assign_nurse -> {
onAssignNurseClick?.invoke(patient)
onAssignNurseClick(patient)
true
}
R.id.action_delete -> { // Handle delete click
onDeleteClick?.invoke(patient)
R.id.action_edit -> {
onEditClick(patient) // NEW
true
}
R.id.action_delete -> {
onDeleteClick(patient)
true
}
else -> false
Expand Down
18 changes: 18 additions & 0 deletions app/src/main/java/deakin/gopher/guardian/model/Nurse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package deakin.gopher.guardian.model.user

data class Nurse(
val _id: String,
val fullname: String,
val email: String,
val assignedPatients: List<Any>?,
val failedLoginAttempts: Int,
val lastPasswordChange: String?,
val created_at: String,
val updated_at: String,
val role: RoleDto,
)

data class RoleDto(
val _id: String,
val name: String,
)
5 changes: 5 additions & 0 deletions app/src/main/java/deakin/gopher/guardian/model/NursesResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package deakin.gopher.guardian.model.user

data class NursesResponse(
val nurses: List<Nurse>,
)
1 change: 1 addition & 0 deletions app/src/main/java/deakin/gopher/guardian/model/Patient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ data class Patient(
@SerializedName("dateOfBirth") val dateOfBirth: String,
@SerializedName("age") val _age: Int,
@SerializedName("gender") val gender: String,
@SerializedName("isDeleted") val isDeleted: Boolean,
@SerializedName("healthConditions") val healthConditions: List<String>,
@SerializedName("caretaker") val caretaker: User,
@SerializedName("assignedNurses") val assignedNurses: List<User>,
Expand Down
Loading