diff --git a/app/src/main/kotlin/jackall/moncalc/db/QuestRecordRealmHelper.kt b/app/src/main/kotlin/jackall/moncalc/db/QuestRecordRealmHelper.kt index ecfc9af..1ba47f1 100644 --- a/app/src/main/kotlin/jackall/moncalc/db/QuestRecordRealmHelper.kt +++ b/app/src/main/kotlin/jackall/moncalc/db/QuestRecordRealmHelper.kt @@ -43,11 +43,23 @@ return realm.where(QuestRecord::class.java).equalTo("templeId", id).findAll().size } + fun countGradeById(id: Int): Int { + val results = realm.where(QuestRecord::class.java).equalTo("drops.gradeId", id).findAll() + var count = 0 + results.forEach { + it.drops.forEach { + if (it.gradeId == id) + count++ + } + } + return count + } + fun getAllSpecialPercent(): Float { - return (realm.where(QuestRecord::class.java).sum("specialCount").toFloat() / realm.where(QuestRecord::class.java).findAll().size.toFloat())*100 + return (realm.where(QuestRecord::class.java).sum("specialCount").toFloat() / realm.where(QuestRecord::class.java).sum("dropCount").toFloat()) * 100 } fun getSpecialPercent(templeId: Int): Float { - return (realm.where(QuestRecord::class.java).equalTo("templeId", templeId).sum("specialCount").toFloat() / realm.where(QuestRecord::class.java).findAll().size.toFloat())*100 + return (realm.where(QuestRecord::class.java).equalTo("attribute", templeId).sum("specialCount").toFloat() / realm.where(QuestRecord::class.java).sum("dropCount").toFloat()) * 100 } } \ No newline at end of file diff --git a/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt b/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt index 07bedd7..bf8586c 100644 --- a/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt +++ b/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt @@ -64,6 +64,7 @@ attribute = monstDataRealmHelper.findTempleAttributeByRank(templeRank.get()), templeId = monstDataRealmHelper.findIdByRank(Temple::class.java, templeRank.get()), specialCount = count, + dropCount = drops.count(), drops = drops, createAt = Date() ) diff --git a/app/src/main/kotlin/jackall/moncalc/viewmodel/TempleAnalyzeViewModel.kt b/app/src/main/kotlin/jackall/moncalc/viewmodel/TempleAnalyzeViewModel.kt index cc5842c..05439ea 100644 --- a/app/src/main/kotlin/jackall/moncalc/viewmodel/TempleAnalyzeViewModel.kt +++ b/app/src/main/kotlin/jackall/moncalc/viewmodel/TempleAnalyzeViewModel.kt @@ -45,8 +45,8 @@ pieChartModel = PieChartModel(entries, "") this.pieData = pieChartModel.pieData - val hoge = ArrayList() - hoge.add( + val items = ArrayList() + items.add( TempleAnalyzeItemViewModel( "総合", questRealmHelper.findAll().size.toString(), @@ -58,7 +58,7 @@ val count = questRealmHelper.countById(it.id) if (count == 0) return@forEach - hoge.add( + items.add( TempleAnalyzeItemViewModel( monstDataRealmHelper.findNameById(Temple::class.java, it.id), count.toString(), @@ -66,7 +66,7 @@ ) ) } - items = hoge + this.items = items } object Adapter { diff --git a/app/src/main/kotlin/jackall/moncalc/vo/QuestRecord.kt b/app/src/main/kotlin/jackall/moncalc/vo/QuestRecord.kt index 3f7792d..2405258 100644 --- a/app/src/main/kotlin/jackall/moncalc/vo/QuestRecord.kt +++ b/app/src/main/kotlin/jackall/moncalc/vo/QuestRecord.kt @@ -11,6 +11,7 @@ open var attribute: Int = -1, open var templeId: Int = -1, open var specialCount: Int = -1, + open var dropCount:Int = -1, open var drops: RealmList = RealmList(), open var createAt: Date = Date() ) : RealmObject() \ No newline at end of file