Skip to content
This repository was archived by the owner on Jun 27, 2020. It is now read-only.

Feature import #88

Closed
wants to merge 4 commits into from
Closed

Feature import #88

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a722c8
#69[1h]. Update export format.
Jun 28, 2016
c8ae2fc
#69[30m]. Sort records by time column on Controller level.
Jun 28, 2016
e64c870
#69[1h]. Add import feature.
Jun 28, 2016
dae57fe
#69[30m]. Add help for import feature.
Jun 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
#69[30m]. Sort records by time column on Controller level.
  • Loading branch information
Evgenii Kanivets committed Jun 28, 2016
commit c8ae2fc74cdb0045bb3b14f940ea991cc1feae1a
1 change: 0 additions & 1 deletion app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/ExportController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ public List<String> getRecordsForExport(long fromDate, long toDate) {

for (Record record : recordList) {
sb = new StringBuilder();
sb.append(record.getId()).append(DELIMITER);
sb.append(record.getTime()).append(DELIMITER);
sb.append(record.getTitle()).append(DELIMITER);

Expand Down
10 changes: 10 additions & 0 deletions app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/data/RecordController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import com.blogspot.e_kanivets.moneytracker.repo.base.IRepo;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;

/**
Expand Down Expand Up @@ -90,6 +92,14 @@ public List<Record> readAll() {
public List<Record> readWithCondition(String condition, String[] args) {
List<Record> recordList = super.readWithCondition(condition, args);

// Sort record list by time field from smallest to biggest
Collections.sort(recordList, new Comparator<Record>() {
@Override
public int compare(Record lhs, Record rhs) {
return lhs.getTime() < rhs.getTime() ? -1 : (lhs.getTime() == rhs.getTime() ? 0 : 1);
}
});

// Data read from DB through Repo layer doesn't contain right nested objects, so construct them
List<Record> completedRecordList = new ArrayList<>();
for (Record record : recordList) {
Expand Down