From c50dc09c8665c43fbe1444a592677fa77c9c9bb1 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 7 Jan 2011 17:13:46 +0000
Subject: [PATCH] NIHVIVO-1625 For custom list views that order by end datetime
 descending, reorder (within a collation, if property is collated) to put
 nulls at beginning rather than end.

---
 productMods/config/listViewConfig-hasRole.xml          | 2 +-
 productMods/config/listViewConfig-personInPosition.xml | 2 +-
 productMods/config/listViewConfig-relatedRole.xml      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/productMods/config/listViewConfig-hasRole.xml b/productMods/config/listViewConfig-hasRole.xml
index 7aac0c99..43a57b98 100644
--- a/productMods/config/listViewConfig-hasRole.xml
+++ b/productMods/config/listViewConfig-hasRole.xml
@@ -24,7 +24,7 @@
                                               ?dateTimeEndValue core:dateTime ?dateTimeEnd }
                        }
             }
-        } ORDER BY DESC(?dateTimeStart) DESC(?dateTimeEnd) ?personName
+        } ORDER BY DESC(?dateTimeEnd) DESC(?dateTimeStart) ?personName
     </query>
     
     <template>propStatement-hasRole.ftl</template>
diff --git a/productMods/config/listViewConfig-personInPosition.xml b/productMods/config/listViewConfig-personInPosition.xml
index 2c04e62d..6f3344f3 100644
--- a/productMods/config/listViewConfig-personInPosition.xml
+++ b/productMods/config/listViewConfig-personInPosition.xml
@@ -24,7 +24,7 @@
                                               ?dateTimeEndValue core:dateTime ?dateTimeEnd } 
                        }
             }
-        } ORDER BY DESC(?dateTimeStart) DESC(?dateTimeEnd) ?orgName
+        } ORDER BY DESC(?dateTimeEnd) DESC(?dateTimeStart) ?orgName
     </query>
     
     <template>propStatement-personInPosition.ftl</template>
diff --git a/productMods/config/listViewConfig-relatedRole.xml b/productMods/config/listViewConfig-relatedRole.xml
index 014c430b..1cbbc53b 100644
--- a/productMods/config/listViewConfig-relatedRole.xml
+++ b/productMods/config/listViewConfig-relatedRole.xml
@@ -29,7 +29,7 @@
                                               ?dateTimeStartValue core:dateTime ?dateTimeStart }
                        }
                        OPTIONAL { GRAPH ?g10 { ?dateTimeInterval core:end ?dateTimeEndValue .
-                                              ?dateTimeEndValue core:dateTime ?dateTimeEnd }
+                                               ?dateTimeEndValue core:dateTime ?dateTimeEnd }
                        }
             }
         } ORDER BY ?subclass DESC(?dateTimeEnd) DESC(?dateTimeStart) ?indivName