mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-20 23:41:45 +02:00
Code Issues Releases Wiki Activity

Only require datetime and weight in CSV file when importing

Browse Source
This commit is contained in:
Erik Johansson
2018-05-13 22:32:55 +02:00
parent 855fb0e5e7
commit b9763ec79f
2 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java
View File

@@ -46,34 +46,34 @@ public class ScaleMeasurement implements Cloneable {
private int userId; private int userId;
@ColumnInfo(name = "enabled") @ColumnInfo(name = "enabled")
private boolean enabled; private boolean enabled;
@CsvColumn (format = "dd.MM.yyyy HH:mm") @CsvColumn(format = "dd.MM.yyyy HH:mm", mustNotBeBlank = true)
@ColumnInfo(name = "datetime") @ColumnInfo(name = "datetime")
private Date dateTime; private Date dateTime;
@CsvColumn @CsvColumn(mustNotBeBlank = true)
@ColumnInfo(name = "weight") @ColumnInfo(name = "weight")
private float weight; private float weight;
@CsvColumn @CsvColumn(mustBeSupplied = false)
@ColumnInfo(name = "fat") @ColumnInfo(name = "fat")
private float fat; private float fat;
@CsvColumn @CsvColumn(mustBeSupplied = false)
@ColumnInfo(name = "water") @ColumnInfo(name = "water")
private float water; private float water;
@CsvColumn @CsvColumn(mustBeSupplied = false)
@ColumnInfo(name = "muscle") @ColumnInfo(name = "muscle")
private float muscle; private float muscle;
@CsvColumn @CsvColumn(mustBeSupplied = false)
@ColumnInfo(name = "lbw") @ColumnInfo(name = "lbw")
private float lbm; private float lbm;
@CsvColumn @CsvColumn(mustBeSupplied = false)
@ColumnInfo(name = "waist") @ColumnInfo(name = "waist")
private float waist; private float waist;
@CsvColumn @CsvColumn(mustBeSupplied = false)
@ColumnInfo(name = "hip") @ColumnInfo(name = "hip")
private float hip; private float hip;
@CsvColumn @CsvColumn(mustBeSupplied = false)
@ColumnInfo(name = "bone") @ColumnInfo(name = "bone")
private float bone; private float bone;
@CsvColumn @CsvColumn(mustBeSupplied = false)
@ColumnInfo(name = "comment") @ColumnInfo(name = "comment")
private String comment; private String comment;

33
android_app/app/src/main/java/com/health/openscale/core/utils/CsvHelper.java
View File

@@ -40,36 +40,29 @@ public class CsvHelper {
final String[] fields = sampleLine.split(",", -1); final String[] fields = sampleLine.split(",", -1);
// Return an array with header fields so that all the headers that actually are // Return an array with header fields that match the guessed version.
// in the file for a given version comes first, and then the rest comes at the end.
if (fields.length == 10) { if (fields.length == 10) {
// From version 1.6 up to 1.7 // From version 1.6 up to 1.7
return new String[]{ return new String[]{"dateTime", "weight", "fat", "water", "muscle", "lbm",
"dateTime", "weight", "fat", "water", "muscle", "lbm", "bone", "waist", "hip", "comment"}; "bone", "waist", "hip", "comment"};
} }
else if (fields.length == 9) { else if (fields.length == 9) {
// From version 1.5.5 (lbm unused) // From version 1.5.5
return new String[]{ return new String[]{"dateTime", "weight", "fat", "water", "muscle", "bone",
"dateTime", "weight", "fat", "water", "muscle", "bone", "waist", "hip", "comment", "waist", "hip", "comment"};
"lbm"};
} }
else if (fields.length == 8) { else if (fields.length == 8) {
// From version 1.3 (lbm and bone unused) // From version 1.3
return new String[]{ return new String[]{"dateTime", "weight", "fat", "water", "muscle", "waist",
"dateTime", "weight", "fat", "water", "muscle", "waist", "hip", "comment", "hip", "comment"};
"lbm", "bone"};
} }
else if (fields.length == 6) { else if (fields.length == 6) {
// From version 1.2 (lbm, bone, waist and hip unused) // From version 1.2
return new String[]{ return new String[]{"dateTime", "weight", "fat", "water", "muscle", "comment"};
"dateTime", "weight", "fat", "water", "muscle", "comment",
"lbm", "bone", "waist", "hip"};
} }
else if (fields.length == 5) { else if (fields.length == 5) {
// From version 1.0 (lbm, bone, waist, hip and muscle unused) // From version 1.0
return new String[]{ return new String[]{"dateTime", "weight", "fat", "water", "comment"};
"dateTime", "weight", "fat", "water", "comment",
"lbm", "bone", "waist", "hip", "muscle"};
} }
// Unknown input data format // Unknown input data format