From b38d7cf81375c4abf44365bc4160dd158a6e8b3b Mon Sep 17 00:00:00 2001 From: Lee Render Date: Tue, 11 Apr 2023 16:33:32 +0800 Subject: [PATCH] rdrf #2444 use custom naming for proms forms in Traffic light --- rdrf/dashboards/components/tl.py | 15 +++++++++++++-- rdrf/dashboards/utils.py | 14 ++++++++++---- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/rdrf/dashboards/components/tl.py b/rdrf/dashboards/components/tl.py index ee793ba63..239c8b621 100644 --- a/rdrf/dashboards/components/tl.py +++ b/rdrf/dashboards/components/tl.py @@ -308,8 +308,19 @@ def _fix_ordering_of_static_followups(self, df): changed = True if changed: - logger.debug("sequence changed for static, renaming") - df = assign_seq_names(df).sort_values(by="SEQ") + from rdrf.models.definition.models import RegistryForm + + def static_get_seq_name(seq, form): + if form == self.static_followups["baseline"]: + form_model = RegistryForm.objects.get(name=form) + return form_model.display_name + else: + for form_dict in self.static_followups["followups"]: + if form_dict["name"] == form: + form_model = RegistryForm.objects.get(name=form) + return form_model.display_name + + df = assign_seq_names(df, static_get_seq_name).sort_values(by="SEQ") return df diff --git a/rdrf/dashboards/utils.py b/rdrf/dashboards/utils.py index ce622102e..12bc5c25f 100644 --- a/rdrf/dashboards/utils.py +++ b/rdrf/dashboards/utils.py @@ -254,8 +254,14 @@ def get_aus_date(row): return "" -def assign_seq_names(df): - df["SEQ_NAME"] = df.apply( - lambda row: get_seq_name(row["SEQ"]) + get_aus_date(row), axis=1 - ) +def assign_seq_names(df, func=None): + if func is None: + df["SEQ_NAME"] = df.apply( + lambda row: get_seq_name(row["SEQ"]) + get_aus_date(row), axis=1 + ) + else: + df["SEQ_NAME"] = df.apply( + lambda row: func(row["SEQ"], row["FORM"]) + get_aus_date(row), axis=1 + ) + return df