move repeated code fragment to a function

lsst · Sep 19, 2024 · fa582b9 · fa582b9
1 parent 9561896
commit fa582b9
Showing 1 changed file with 6 additions and 41 deletions.
diff --git a/schedview/app/scheduler_dashboard/unrestricted_scheduler_snapshot_dashboard.py b/schedview/app/scheduler_dashboard/unrestricted_scheduler_snapshot_dashboard.py
@@ -227,25 +227,7 @@ def _update_scheduler_fname(self):
         self.summary_widget.selection = [0]
         self._do_not_trigger_update = False
 
-        # Suggestion: here the fragment is used again
-        self.compute_survey_maps()
-        self.survey_map = self.param["survey_map"].objects[-1]
-        self._map_name = self.survey_map.split("@")[0].strip()
-
-        self.create_sky_map_base()
-        self.update_sky_map_with_survey_map()
-        self.param.trigger("_publish_map")
-
-        self.make_reward_df()
-        self.create_reward_widget()
-        self.param.trigger("_publish_reward_widget")
-
-        self._display_dashboard_data = True
-        self._display_reward = False
-        self.param.trigger("_update_headings")
-
-        self.show_loading_indicator = False
-        # --------------------------------End of fragment
+        self._update_map_and_rewards()
 
     @param.depends("widget_datetime", watch=True)
     def _update_mjd_from_picker(self):
@@ -287,7 +269,10 @@ def _update_mjd_from_picker(self):
         self.summary_widget.selection = [0]
         self._do_not_trigger_update = False
 
-        # Suggestion: here the fragment is used again
+        self._update_map_and_rewards()
+
+    def _update_map_and_rewards(self):
+        """Update map, reward widget and headings."""
         self.compute_survey_maps()
         self.survey_map = self.param["survey_map"].objects[-1]
         self._map_name = self.survey_map.split("@")[0].strip()
@@ -305,7 +290,6 @@ def _update_mjd_from_picker(self):
         self.param.trigger("_update_headings")
 
         self.show_loading_indicator = False
-        # --------------------------------End of fragment
 
     @param.depends("url_mjd", watch=True)
     def _update_mjd_from_url(self):
@@ -344,26 +328,7 @@ def _update_mjd_from_url(self):
         self.summary_widget.selection = [0]
         self._do_not_trigger_update = False
 
-        # Suggestion: Should this fragment be separated into a function?
-        # it is used 3x in functions.
-        self.compute_survey_maps()
-        self.survey_map = self.param["survey_map"].objects[-1]
-        self._map_name = self.survey_map.split("@")[0].strip()
-
-        self.create_sky_map_base()
-        self.update_sky_map_with_survey_map()
-        self.param.trigger("_publish_map")
-
-        self.make_reward_df()
-        self.create_reward_widget()
-        self.param.trigger("_publish_reward_widget")
-
-        self._display_dashboard_data = True
-        self._display_reward = False
-        self.param.trigger("_update_headings")
-
-        self.show_loading_indicator = False
-        # --------------------------------End of fragment
+        self._update_map_and_rewards()
 
     @param.depends("widget_tier", watch=True)
     def _update_tier(self):