Merge pull request mbari-org#245 from MBARIMike/main

Fix ordering
ksalamy · May 30, 2024 · ceac654 · ceac654
2 parents d359553 + 1af6eda
commit ceac654
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/smdb/scripts/load.py b/smdb/scripts/load.py
@@ -1703,7 +1703,9 @@ def read_from_db_into_rows(self, parent_dir: str) -> pd.DataFrame:
 
         # Add rows for each mission
         rows = []
-        for mission in Mission.objects.filter(name__startswith=parent_dir):
+        for mission in Mission.objects.filter(name__startswith=parent_dir).order_by(
+            "name"
+        ):
             self.logger.debug(mission)
             row = []
             for col in col_lookup.keys():

diff --git a/smdb/smdb/views.py b/smdb/smdb/views.py
@@ -250,6 +250,7 @@ def get_context_data(self, **kwargs):
         table = CompilationTable(
             Compilation.objects.filter(missions=mission),
             exclude=["missions"],
+            order_by="-creation_date",
         )
         RequestConfig(self.request).configure(table)
         context["table"] = table
@@ -309,6 +310,7 @@ def get_context_data(self, **kwargs):
         table = MissionTable(
             Mission.objects.filter(compilations=compilation),
             exclude=["track_length", "start_depth"],
+            order_by="-start_date",
         )
         RequestConfig(self.request).configure(table)
         context["table"] = table