completed tasks bubble to the bottom in most sorts

astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java

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

astrid/src/com/todoroo/astrid/service/TaskService.java

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