From e51c24cc1ff7141b9101ad48e2d32799faba71e1 Mon Sep 17 00:00:00 2001 From: jamshid Date: Thu, 22 Aug 2019 15:29:05 +0430 Subject: [PATCH 1/2] #377 Added Arrow number to exported file --- .../de/dreier/mytargets/features/statistics/CsvExporter.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt index b3219ee6f..9a2d33a94 100644 --- a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt +++ b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt @@ -58,6 +58,7 @@ class CsvExporter(private val context: Context, database: AppDatabase) { csv.add(context.getString(R.string.passe)) csv.add(context.getString(R.string.timestamp)) csv.add(context.getString(R.string.points)) + csv.add(context.getString(R.string.arrow_numbers)) csv.add("x") csv.add("y") csv.newLine() @@ -114,11 +115,13 @@ class CsvExporter(private val context: Context, database: AppDatabase) { csv.add((e.index + 1).toString()) // Timestamp csv.add(e.saveTime!!.format(DateTimeFormatter.ISO_LOCAL_TIME)) - for ((_, index, _, x, y, scoringRing) in endDAO.loadShots(e.id)) { + for ((_, index, _, x, y, scoringRing, arrowNumber) in endDAO.loadShots(e.id)) { csv.enterScope() // Score csv.add(target.zoneToString(scoringRing, index)) + csv.add(if (arrowNumber == null) "" else arrowNumber) + // Coordinates (X, Y) csv.add(x.toString()) csv.add(y.toString()) From 7c04b56fa0be954b495b5a39a86e3bbbbc913d7a Mon Sep 17 00:00:00 2001 From: jamshid Date: Thu, 22 Aug 2019 21:00:33 +0430 Subject: [PATCH 2/2] #377 Simplify code --- .../java/de/dreier/mytargets/features/statistics/CsvExporter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt index 9a2d33a94..ac367ae13 100644 --- a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt +++ b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt @@ -120,7 +120,7 @@ class CsvExporter(private val context: Context, database: AppDatabase) { // Score csv.add(target.zoneToString(scoringRing, index)) - csv.add(if (arrowNumber == null) "" else arrowNumber) + csv.add(arrowNumber ?: "") // Coordinates (X, Y) csv.add(x.toString())