archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

completed tasks bubble to the bottom in most sorts

Browse Source
pull/14/head
Tim Su 14 years ago
parent 7fa70df9fe
commit 16bd76b18f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File

5
astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java
Unescape Escape View File

@ -99,13 +99,14 @@ public class SortSelectionActivity {
break; break;
case SortSelectionActivity.SORT_DUE: case SortSelectionActivity.SORT_DUE:
order = Order.asc(Functions.caseStatement(Task.DUE_DATE.eq(0), order = Order.asc(Functions.caseStatement(Task.DUE_DATE.eq(0),
DateUtilities.now()*2, Task.DUE_DATE) + "+" + Task.IMPORTANCE); DateUtilities.now()*2, Task.DUE_DATE) + "+" + Task.IMPORTANCE +
"+3*" + Task.COMPLETION_DATE);
break; break;
case SortSelectionActivity.SORT_IMPORTANCE: case SortSelectionActivity.SORT_IMPORTANCE:
order = Order.asc(Task.IMPORTANCE + "*" + (2*DateUtilities.now()) + //$NON-NLS-1$ order = Order.asc(Task.IMPORTANCE + "*" + (2*DateUtilities.now()) + //$NON-NLS-1$
"+" + Functions.caseStatement(Task.DUE_DATE.eq(0), //$NON-NLS-1$ "+" + Functions.caseStatement(Task.DUE_DATE.eq(0), //$NON-NLS-1$
Functions.now() + "+" + DateUtilities.ONE_WEEK, //$NON-NLS-1$ Functions.now() + "+" + DateUtilities.ONE_WEEK, //$NON-NLS-1$
Task.DUE_DATE)); Task.DUE_DATE) + "+8*" + Task.COMPLETION_DATE);
break; break;
case SortSelectionActivity.SORT_MODIFIED: case SortSelectionActivity.SORT_MODIFIED:
order = Order.desc(Task.MODIFICATION_DATE); order = Order.desc(Task.MODIFICATION_DATE);

4
astrid/src/com/todoroo/astrid/service/TaskService.java
Unescape Escape View File

@ -14,8 +14,8 @@ import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.PermaSql; import com.todoroo.astrid.api.PermaSql;
import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
import com.todoroo.astrid.model.Metadata; import com.todoroo.astrid.model.Metadata;
import com.todoroo.astrid.model.Task; import com.todoroo.astrid.model.Task;
@ -207,7 +207,7 @@ public class TaskService {
return Order.asc(Functions.caseStatement(Task.DUE_DATE.eq(0), return Order.asc(Functions.caseStatement(Task.DUE_DATE.eq(0),
DateUtilities.now() + DateUtilities.ONE_WEEK, DateUtilities.now() + DateUtilities.ONE_WEEK,
Task.DUE_DATE) + " + 200000000 * " + Task.DUE_DATE) + " + 200000000 * " +
Task.IMPORTANCE + " + " + Task.COMPLETION_DATE); Task.IMPORTANCE + " + 2*" + Task.COMPLETION_DATE);
} }
/** /**

Write Preview
Loading…
Cancel
Save