Merge pull request #40 from lsst/tickets/PREOPS-4105

Tickets/PREOPS-4105: Change how survey number is queried in subtitle.

schedview/app/scheduler_dashboard/scheduler_dashboard.py

@@ -1028,13 +1028,12 @@ def generate_dashboard_subtitle(self):
         if not self._display_dashboard_data:
             return ""
         maps = ["u_sky", "g_sky", "r_sky", "i_sky", "z_sky", "y_sky", "reward"]
-        survey = self._survey_name.split(":")[0]
         if not self._display_reward and self.survey_map in maps:
-            return f"\nTier {self._tier[-1]} - Survey {survey} - Map {self._map_name}"
+            return f"\nTier {self._tier[-1]} - Survey {self._survey} - Map {self._map_name}"
         elif not self._display_reward and self.survey_map not in maps:
-            return f"\nTier {self._tier[-1]} - Survey {survey} - Reward {self._map_name}"
+            return f"\nTier {self._tier[-1]} - Survey {self._survey} - Reward {self._map_name}"
         else:
-            return f"\nTier {self._tier[-1]} - Survey {survey} - Reward {self._reward_name}"
+            return f"\nTier {self._tier[-1]} - Survey {self._survey} - Reward {self._reward_name}"
 
     def generate_summary_table_heading(self):
         """Select the summary table heading based on whether data is being

tests/test_scheduler_dashboard.py

@@ -89,7 +89,9 @@ def test_read_scheduler(self):
     def test_title(self):
         self.scheduler._tier = "tier 2"
         self.scheduler._survey = 0
-        self.scheduler._survey_name = "0: survey"
+        self.scheduler.param["survey_map"].objects = ["reward"]
+        self.scheduler.survey_map = "reward"
+        self.scheduler._map_name = "reward"
         self.scheduler._display_dashboard_data = True
         title = self.scheduler.generate_dashboard_subtitle()
         tier = self.scheduler._tier[-1]