isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

now writing question and description to csv

Browse Source
This commit is contained in:
Rechee
2020-01-08 17:59:26 -08:00
parent 88d6a8e513
commit 46761926d2
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java
View File

@@ -212,6 +212,7 @@ public abstract class HabitList implements Iterable<Habit>
String header[] = { String header[] = {
"Position", "Position",
"Name", "Name",
"Question",
"Description", "Description",
"NumRepetitions", "NumRepetitions",
"Interval", "Interval",
@@ -229,6 +230,7 @@ public abstract class HabitList implements Iterable<Habit>
String.format("%03d", indexOf(habit) + 1), String.format("%03d", indexOf(habit) + 1),
habit.getName(), habit.getName(),
habit.getQuestion(), habit.getQuestion(),
habit.getDescription(),
Integer.toString(freq.getNumerator()), Integer.toString(freq.getNumerator()),
Integer.toString(freq.getDenominator()), Integer.toString(freq.getDenominator()),
ColorConstants.CSV_PALETTE[habit.getColor()] ColorConstants.CSV_PALETTE[habit.getColor()]

8
android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java
View File

@@ -219,12 +219,14 @@ public class HabitListTest extends BaseUnitTest
Habit h1 = fixtures.createEmptyHabit(); Habit h1 = fixtures.createEmptyHabit();
h1.setName("Meditate"); h1.setName("Meditate");
h1.setQuestion("Did you meditate this morning?"); h1.setQuestion("Did you meditate this morning?");
h1.setDescription("this is a test description");
h1.setFrequency(Frequency.DAILY); h1.setFrequency(Frequency.DAILY);
h1.setColor(3); h1.setColor(3);
Habit h2 = fixtures.createEmptyHabit(); Habit h2 = fixtures.createEmptyHabit();
h2.setName("Wake up early"); h2.setName("Wake up early");
h2.setQuestion("Did you wake up before 6am?"); h2.setQuestion("Did you wake up before 6am?");
h2.setDescription(null);
h2.setFrequency(new Frequency(2, 3)); h2.setFrequency(new Frequency(2, 3));
h2.setColor(5); h2.setColor(5);
@@ -232,9 +234,9 @@ public class HabitListTest extends BaseUnitTest
list.add(h2); list.add(h2);
String expectedCSV = String expectedCSV =
"Position,Name,Description,NumRepetitions,Interval,Color\n" + "Position,Name,Question,Description,NumRepetitions,Interval,Color\n" +
"001,Meditate,Did you meditate this morning?,1,1,#FF8F00\n" + "001,Meditate,Did you meditate this morning?,this is a test description,1,1,#FF8F00\n" +
"002,Wake up early,Did you wake up before 6am?,2,3,#AFB42B\n"; "002,Wake up early,Did you wake up before 6am?,,2,3,#AFB42B\n";
StringWriter writer = new StringWriter(); StringWriter writer = new StringWriter();
list.writeCSV(writer); list.writeCSV(writer);