gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

calculate percent with voters instead votes

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-07-14 15:32:25 +02:00 committed by Andy Scherzinger (Rebase PR Action)
parent a8afb61745
commit 3b4be83ea7
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/nextcloud/talk/polls/model/Poll.kt
View File

@ -33,8 +33,7 @@ data class Poll(
val maxVotes: Int, val maxVotes: Int,
val votedSelf: List<Int>?, val votedSelf: List<Int>?,
val numVoters: Int, val numVoters: Int,
val details: List<PollDetails>?, val details: List<PollDetails>?
val totalVotes: Int
) { ) {
companion object { companion object {
const val STATUS_OPEN: Int = 0 const val STATUS_OPEN: Int = 0

11
app/src/main/java/com/nextcloud/talk/polls/repositories/PollRepositoryImpl.kt
View File

@ -133,8 +133,7 @@ class PollRepositoryImpl(private val ncApi: NcApi, private val currentUserProvid
pollResponse.maxVotes, pollResponse.maxVotes,
pollResponse.votedSelf, pollResponse.votedSelf,
pollResponse.numVoters, pollResponse.numVoters,
pollDetails, pollDetails
getTotalVotes(pollResponse.votes)
) )
} }
@ -154,13 +153,5 @@ class PollRepositoryImpl(private val ncApi: NcApi, private val currentUserProvid
pollDetailsResponse.optionId, pollDetailsResponse.optionId,
) )
} }
private fun getTotalVotes(votes: Map<String, Int>?): Int {
var totalVotes = 0
votes?.forEach {
totalVotes += it.value
}
return totalVotes
}
} }
} }

2
app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollResultsViewModel.kt
View File

@ -84,7 +84,7 @@ class PollResultsViewModel @Inject constructor() : ViewModel() {
private fun initPollResults(poll: Poll) { private fun initPollResults(poll: Poll) {
_items.value = ArrayList() _items.value = ArrayList()
val oneVoteInPercent = HUNDRED / poll.totalVotes val oneVoteInPercent = HUNDRED / poll.numVoters
poll.options?.forEachIndexed { index, option -> poll.options?.forEachIndexed { index, option ->
val votersAmountForThisOption = getVotersAmountForOption(poll, index) val votersAmountForThisOption = getVotersAmountForOption(poll, index)