Display times with time part first by default too

orgzly · Sep 26, 2017 · b5924ad · b5924ad
1 parent 775ae7c
commit b5924ad
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/app/src/main/java/com/orgzly/android/provider/clients/NotesClient.java b/app/src/main/java/com/orgzly/android/provider/clients/NotesClient.java
@@ -502,22 +502,29 @@ private static String getOrderForQuery(Context context, SearchQuery searchQuery)
                         orderByColumns.add(ProviderContract.Notes.QueryParam.DEADLINE_TIME_TIMESTAMP + " DESC");
                     }
 
-
                 } else if (so.getType() == SearchQuery.SortOrder.Type.PRIORITY) {
                     orderByColumns.add("COALESCE(" + ProviderContract.Notes.QueryParam.PRIORITY + ", '" + defaultPriority + "')" + (so.isAscending() ? "" : " DESC"));
                 }
             }
-        } else {
+
+        } else { // No explicit ordering specified
+
             orderByColumns.add(ProviderContract.Notes.QueryParam.BOOK_NAME);
 
             /* Priority or default priority. */
             orderByColumns.add("COALESCE(" + ProviderContract.Notes.QueryParam.PRIORITY + ", '" + defaultPriority + "')");
 
             if (searchQuery.hasDeadline()) {
+                orderByColumns.add(ProviderContract.Notes.QueryParam.DEADLINE_TIME_TIMESTAMP + " IS NULL");
+                orderByColumns.add(ProviderContract.Notes.QueryParam.DEADLINE_TIME_START_OF_DAY);
+                orderByColumns.add(ProviderContract.Notes.QueryParam.DEADLINE_TIME_HOUR + " IS NULL");
                 orderByColumns.add(ProviderContract.Notes.QueryParam.DEADLINE_TIME_TIMESTAMP);
             }
 
             if (searchQuery.hasScheduled()) {
+                orderByColumns.add(ProviderContract.Notes.QueryParam.SCHEDULED_TIME_TIMESTAMP + " IS NULL");
+                orderByColumns.add(ProviderContract.Notes.QueryParam.SCHEDULED_TIME_START_OF_DAY);
+                orderByColumns.add(ProviderContract.Notes.QueryParam.SCHEDULED_TIME_HOUR + " IS NULL");
                 orderByColumns.add(ProviderContract.Notes.QueryParam.SCHEDULED_TIME_TIMESTAMP);
             }
         }