Mid-code cleanup

src/submissions/frontend/visualizations/turnaround_chart.py

@@ -11,25 +11,33 @@ logger = logging.getLogger(f"submissions.{__name__}")
 
 class TurnaroundChart(CustomFigure):
 
-    def __init__(self, df: pd.DataFrame, modes: list, settings: dict, ytitle: str | None = None,
+    def __init__(self, df: pd.DataFrame, modes: list, settings: dict, threshold: float | None = None,
+                 ytitle: str | None = None,
                  parent: QWidget | None = None,
                  months: int = 6):
         super().__init__(df=df, modes=modes, settings=settings)
+        self.df = df
         try:
             months = int(settings['months'])
         except KeyError:
             months = 6
         # logger.debug(f"DF: {self.df}")
-        self.construct_chart(df=df)
-        self.add_hline(y=3.5)
+        self.construct_chart()
+        if threshold:
+            self.add_hline(y=threshold)
         # self.update_xaxes()
         self.update_layout(showlegend=False)
 
-    def construct_chart(self, df: pd.DataFrame):
+    def construct_chart(self, df: pd.DataFrame | None = None):
+        if df:
+            self.df = df
         # logger.debug(f"PCR df:\n {df}")
-        df = df.sort_values(by=['submitted_date', 'name'])
+        self.df = self.df[self.df.days.notnull()]
+        self.df = self.df.sort_values(['submitted_date', 'name'], ascending=[True, True]).reset_index(drop=True)
+        self.df = self.df.reset_index().rename(columns={"index": "idx"})
+        # logger.debug(f"DF: {self.df}")
         try:
-            scatter = px.scatter(data_frame=df, x='name', y="days",
+            scatter = px.scatter(data_frame=self.df, x='idx', y="days",
                                  hover_data=["name", "submitted_date", "completed_date", "days"],
                                  color="acceptable", color_discrete_map={True: "green", False: "red"}
                                  )
@@ -37,3 +45,12 @@ class TurnaroundChart(CustomFigure):
             scatter = px.scatter()
         self.add_traces(scatter.data)
         self.update_traces(marker={'size': 15})
+        tickvals = self.df['idx'].tolist()
+        ticklabels = self.df['name'].tolist()
+        self.update_layout(
+            xaxis=dict(
+                tickmode='array',
+                tickvals=tickvals,
+                ticktext=ticklabels,
+            )
+        )