From 01257bb9b4e75bb870c081ffc489fc39283b2fe3 Mon Sep 17 00:00:00 2001
From: bag <bagasaryo03@gmail.com>
Date: Fri, 5 Apr 2024 13:41:49 +0700
Subject: [PATCH] fix:dashboard
---
.idea/deploymentTargetDropDown.xml | 14 +-------------
.../pbd_jwr/ui/dashboard/DashboardFragment.kt | 5 ++++-
.../pbd_jwr/ui/settings/SettingsFragment.kt | 6 ++++--
3 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 4a47f26..0c0c338 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -3,19 +3,7 @@
<component name="deploymentTargetDropDown">
<value>
<entry key="app">
- <State>
- <targetsSelectedWithDialog>
- <Target>
- <type value="QUICK_BOOT_TARGET" />
- <deviceKey>
- <Key>
- <type value="VIRTUAL_DEVICE_PATH" />
- <value value="C:\Users\ASUS\.android\avd\Pixel_7_API_31.avd" />
- </Key>
- </deviceKey>
- </Target>
- </targetsSelectedWithDialog>
- </State>
+ <State />
</entry>
</value>
</component>
diff --git a/app/src/main/java/com/example/pbd_jwr/ui/dashboard/DashboardFragment.kt b/app/src/main/java/com/example/pbd_jwr/ui/dashboard/DashboardFragment.kt
index 12da78b..8660fa3 100644
--- a/app/src/main/java/com/example/pbd_jwr/ui/dashboard/DashboardFragment.kt
+++ b/app/src/main/java/com/example/pbd_jwr/ui/dashboard/DashboardFragment.kt
@@ -1,5 +1,6 @@
package com.example.pbd_jwr.ui.dashboard
+import android.content.SharedPreferences
import android.graphics.Color
import android.os.Bundle
import android.view.LayoutInflater
@@ -24,6 +25,7 @@ class DashboardFragment : Fragment() {
private lateinit var pieChart: PieChart
private lateinit var viewModel: TransactionViewModel
+ private lateinit var encryptedSharedPref: SharedPreferences
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
@@ -40,7 +42,8 @@ class DashboardFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
- viewModel.getAllTransactions().observe(viewLifecycleOwner) { transactions ->
+ val currentUserEmail = encryptedSharedPref.getString("email", "") ?: ""
+ viewModel.getTransactionsByEmail(currentUserEmail).observe(viewLifecycleOwner) { transactions ->
loadPieChartData(transactions)
}
}
diff --git a/app/src/main/java/com/example/pbd_jwr/ui/settings/SettingsFragment.kt b/app/src/main/java/com/example/pbd_jwr/ui/settings/SettingsFragment.kt
index 1876e51..a6819f8 100644
--- a/app/src/main/java/com/example/pbd_jwr/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/example/pbd_jwr/ui/settings/SettingsFragment.kt
@@ -75,7 +75,8 @@ class SettingsFragment : Fragment() {
JWR App
""".trimIndent()
- transactionViewModel.getAllTransactions().observe(viewLifecycleOwner) { transactions ->
+ val currentUserEmail = encryptedSharedPref.getString("email", "") ?: ""
+ transactionViewModel.getTransactionsByEmail(currentUserEmail).observe(viewLifecycleOwner) { transactions ->
exportTransactionsToExcel(transactions, requireContext())?.let { uri ->
val emailIntent = Intent(Intent.ACTION_SEND).apply {
type = "vnd.android.cursor.dir/email"
@@ -91,7 +92,8 @@ class SettingsFragment : Fragment() {
}
private fun saveTransactionsToExcel() {
- transactionViewModel.getAllTransactions().observe(viewLifecycleOwner) { transactions ->
+ val currentUserEmail = encryptedSharedPref.getString("email", "") ?: ""
+ transactionViewModel.getTransactionsByEmail(currentUserEmail).observe(viewLifecycleOwner) { transactions ->
exportTransactionsToExcel(transactions, requireContext())
}
}
--
GitLab