Skip to content
Snippets Groups Projects
Commit 7c4c8460 authored by yansans's avatar yansans
Browse files

Merge remote-tracking branch 'origin/dev' into dev

parents 7b67eaa3 24f6620e
1 merge request!13Release
...@@ -121,6 +121,17 @@ class ScanResultFragment : Fragment() { ...@@ -121,6 +121,17 @@ class ScanResultFragment : Fragment() {
latitude = it.latitude.toString() latitude = it.latitude.toString()
) )
transactionsViewModel.upsert(transaction) transactionsViewModel.upsert(transaction)
} else {
Log.d("ScanResult", "Saving note on database")
val transaction = Transactions(
judul = "Scanner_${title}",
nominal = value,
isPemasukan = false,
tanggal = currentDate,
longitude = "",
latitude = ""
)
transactionsViewModel.upsert(transaction)
} }
} }
} else { } else {
......
...@@ -73,7 +73,6 @@ class AddTransactionsFragment : Fragment() { ...@@ -73,7 +73,6 @@ class AddTransactionsFragment : Fragment() {
LocationManager.askLocationPermission(requireContext(), requireActivity()) LocationManager.askLocationPermission(requireContext(), requireActivity())
if (LocationManager.haveLocationPermission(requireContext())) { if (LocationManager.haveLocationPermission(requireContext())) {
Log.d("ScanResult", "Saving note on database")
Log.d("LocationManager", "Getting last location") Log.d("LocationManager", "Getting last location")
val fusedLocationProviderClient = val fusedLocationProviderClient =
LocationServices.getFusedLocationProviderClient(requireContext()) LocationServices.getFusedLocationProviderClient(requireContext())
...@@ -95,10 +94,19 @@ class AddTransactionsFragment : Fragment() { ...@@ -95,10 +94,19 @@ class AddTransactionsFragment : Fragment() {
latitude = it.latitude.toString() latitude = it.latitude.toString()
) )
transactionsViewModel.upsert(transaction) transactionsViewModel.upsert(transaction)
} else {
val transaction = Transactions(
judul = judul,
nominal = nominal,
isPemasukan = isPemasukan,
tanggal = currentDate,
longitude = "",
latitude = ""
)
transactionsViewModel.upsert(transaction)
} }
} }
} else { } else {
Log.d("ScanResult", "Saving note on database")
val transaction = Transactions( val transaction = Transactions(
judul = judul, judul = judul,
nominal = nominal, nominal = nominal,
......
...@@ -55,6 +55,16 @@ class TransactionsBroadcastReceiver(private val transactionsViewModel: Transacti ...@@ -55,6 +55,16 @@ class TransactionsBroadcastReceiver(private val transactionsViewModel: Transacti
latitude = latitude latitude = latitude
) )
transactionsViewModel.upsert(transaction) transactionsViewModel.upsert(transaction)
} else {
val transaction: Transactions = Transactions(
judul = randomJudul,
nominal = randomNominal,
isPemasukan = randomIsPemasukan,
tanggal = currentDate,
longitude = "",
latitude = ""
)
transactionsViewModel.upsert(transaction)
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment