From 0b5a2579d5f123a9ab5d4597889d4c13f01282c9 Mon Sep 17 00:00:00 2001 From: Miguel Date: Sat, 28 Jun 2025 16:06:20 +0200 Subject: [PATCH] =?UTF-8?q?Actualizaci=C3=B3n=20del=20archivo=20de=20histo?= =?UTF-8?q?rial=20con=20la=20funci=C3=B3n=20'h'=20para=20obtener=20la=20fe?= =?UTF-8?q?cha=20actual=20y=20ajuste=20en=20la=20definici=C3=B3n=20de=20'f?= =?UTF-8?q?'=20para=20calcular=20fechas.=20Mejora=20en=20la=20representaci?= =?UTF-8?q?=C3=B3n=20de=20fechas=20en=20la=20clase=20Class=5FDate,=20imple?= =?UTF-8?q?mentando=20un=20m=C3=A9todo=20para=20mostrar=20la=20fecha=20act?= =?UTF-8?q?ual=20y=20optimizando=20la=20salida=20de=20la=20representaci?= =?UTF-8?q?=C3=B3n=20de=20fechas=20con=20s=C3=ADmbolos.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .data/history.txt | 4 ++-- custom_types/date_type.py | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.data/history.txt b/.data/history.txt index d4d5973..54917f6 100644 --- a/.data/history.txt +++ b/.data/history.txt @@ -36,6 +36,6 @@ hacer_por_dia = faltan/dias_faltan # Minimo para terminar promedio_ideal = total/(dias_pasados+dias_faltan) - -Date('23/4/25')=Date('23/2/25') + x +h = Today() +f = Date('23/2/25') + x x=? diff --git a/custom_types/date_type.py b/custom_types/date_type.py index 0bdaabe..1db66ee 100644 --- a/custom_types/date_type.py +++ b/custom_types/date_type.py @@ -116,11 +116,13 @@ class Class_Date(SympyClassBase): # ------------------------------------------------------------------ def __repr__(self): # noqa: D401 + if self._has_symbols: + return f"Date({sympy.sstr(self._ordinal_expr)})" return f"Date('{self.__str__()}')" def __str__(self): # noqa: D401 if self._has_symbols: - return str(self._ordinal_expr) + return f"Date({sympy.sstr(self._ordinal_expr)})" return self._date.strftime("%d/%m/%y") def _sympystr(self, printer): # pragma: no cover @@ -320,12 +322,13 @@ class Class_Date(SympyClassBase): ("to_ordinal", "Ordinal (nº de días)"), ] + @classmethod def today(cls) -> "Class_Date": """Fecha actual (según *datetime.date.today()*).""" return cls(datetime.date.today()) - # Alias estático para consistencia con otras clases - Today = classmethod(today) + # Alias interno por consistencia con el resto del sistema + Today = today # ----------------------------------------------------------------------