diff --git a/module/webui/widgets.py b/module/webui/widgets.py index dad26022a..6cb75681d 100644 --- a/module/webui/widgets.py +++ b/module/webui/widgets.py @@ -396,8 +396,8 @@ def put_arg_planner(kwargs: T_Output_Kwargs) -> Output | None: values = kwargs.pop("value", {}) try: - progress = values["progress"] - except KeyError: + progress = float(values["progress"]) + except (KeyError, ValueError): # Hide items not needed by the planner return None eta = values.get("eta", 0) @@ -413,7 +413,7 @@ def put_arg_planner(kwargs: T_Output_Kwargs) -> Output | None: if isinstance(total, dict): total = tuple(total.values()) - if eta: + if progress < 100: row = put_scope(f"arg_stored-stored-value-{name}", [ put_text(f"{progress:.2f}%{eta}").style("--dashboard-bold--"), put_text(f"{value} / {total}").style("--dashboard-time--"), diff --git a/tasks/planner/model.py b/tasks/planner/model.py index b93458163..860d357b0 100644 --- a/tasks/planner/model.py +++ b/tasks/planner/model.py @@ -297,6 +297,8 @@ class StoredPlannerProxy(BaseModelWithFallback): return 0. if self.item.dungeon is None: return 0. + if self.item.is_ItemWeekly: + return 0. remain = self.progress_remain cost = self.combat_cost