Fixes import issue

od
Laurent 6 years ago
parent bf3439963b
commit 96a4dc9c54
  1. 4
      app/src/main/java/net/pokeranalytics/android/util/csv/CSVDescriptor.kt
  2. 7
      app/src/main/java/net/pokeranalytics/android/util/csv/CSVField.kt
  3. 2
      app/src/main/java/net/pokeranalytics/android/util/csv/PACSVDescriptor.kt
  4. 3
      app/src/main/java/net/pokeranalytics/android/util/csv/ProductCSVDescriptors.kt

@ -147,9 +147,9 @@ abstract class CSVDescriptor(var source: DataSource, vararg elements: CSVField)
count++ count++
} }
} }
val mandatoryfields = this.fields.filter { it.optional == false } val mandatoryFields = this.fields.filter { !it.optional }
Timber.d("source= ${this.source.name} > total fields = ${this.fields.size}, identified = $count") Timber.d("source= ${this.source.name} > total fields = ${this.fields.size}, identified = $count")
return count >= mandatoryfields.size return count >= mandatoryFields.size
} }
protected val csvHeaders: String protected val csvHeaders: String

@ -123,7 +123,7 @@ interface TournamentFeaturesCSVField : TypedCSVField<List<TournamentFeature>> {
} }
override fun format(data: List<TournamentFeature>?): String? { override fun format(data: List<TournamentFeature>?): String? {
return data?.joinToString(",") { it.name } return data?.joinToString(CSVField.separator) { it.name }
} }
} }
@ -178,6 +178,11 @@ interface TypedCSVField<T> : CSVField {
interface CSVField { interface CSVField {
companion object {
const val delimiter = "\""
const val separator = "|"
}
val header: String val header: String
val optional: Boolean val optional: Boolean
get() { get() {

@ -187,7 +187,7 @@ abstract class PACSVDescriptor<T : Identifiable>(source: DataSource, private var
field.parse(value) field.parse(value)
is SessionField.TournamentEntryFee -> session.tournamentEntryFee = field.parse(value) is SessionField.TournamentEntryFee -> session.tournamentEntryFee = field.parse(value)
is SessionField.TournamentFeatures -> { is SessionField.TournamentFeatures -> {
value.split(",").forEach { featureName -> value.split(CSVField.separator).forEach { featureName ->
val tournamentFeature: TournamentFeature = realm.getOrCreate(featureName) val tournamentFeature: TournamentFeature = realm.getOrCreate(featureName)
session.tournamentFeatures.add(tournamentFeature) session.tournamentFeatures.add(tournamentFeature)
} }

@ -217,8 +217,7 @@ class ProductCSVDescriptors {
SessionField.TournamentName("Tournament Name"), SessionField.TournamentName("Tournament Name"),
SessionField.TournamentEntryFee("Entry fee"), SessionField.TournamentEntryFee("Entry fee"),
SessionField.TournamentNumberOfPlayers("Number of players"), SessionField.TournamentNumberOfPlayers("Number of players"),
SessionField.TournamentFeatures("Number of players"), SessionField.TournamentFeatures("Tournament Features"),
SessionField.TournamentPrizePool("Prize Pool"),
SessionField.TournamentPosition("Position"), SessionField.TournamentPosition("Position"),
SessionField.Comment("Comment") SessionField.Comment("Comment")
) )

Loading…
Cancel
Save