Skip to content

Commit

Permalink
quitando dateformat
Browse files Browse the repository at this point in the history
  • Loading branch information
germankay committed Nov 21, 2024
1 parent 2960692 commit a7c8107
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 26 deletions.
27 changes: 2 additions & 25 deletions ckanext/superset/data/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import logging
import urllib.parse
import httpx
from datetime import datetime
from ckanext.superset.data.dataset import SupersetDataset


Expand Down Expand Up @@ -45,13 +44,6 @@ def __init__(
self.datasets_response = None
self.datasets = [] # {ID: data}

def format_date(self, date_string, input_format='%Y-%m-%dT%H:%M:%S.%f', output_format='%d/%m/%Y %H:%M:%S'):
try:
date_obj = datetime.strptime(date_string, input_format)
return date_obj.strftime(output_format)
except (ValueError, TypeError):
return date_string

def load_datasets(self, force=False):
""" Get and load all datasets """
if self.datasets and not force:
Expand All @@ -63,16 +55,8 @@ def load_datasets(self, force=False):
for dataset in datasets:
ds = SupersetDataset()
ds.load(dataset)

# Formatea el campo 'changed_on_utc' antes de agregarlo al objeto
if 'changed_on_utc' in ds.data:
ds.data['changed_on'] = self.format_date(
ds.data['changed_on_utc'], # Formatea este campo
input_format='%Y-%m-%dT%H:%M:%S.%f%z',
output_format='%d/%m/%Y %H:%M:%S'
)

self.datasets.append(ds)
return self.datasets

def load_databases(self, force=False):
if hasattr(self, 'databases') and self.databases and not force:
Expand All @@ -81,14 +65,7 @@ def load_databases(self, force=False):
self.databases_response = self.get("database/")
self.databases = self.databases_response.get("result", [])

# Formatear las fechas en los datos de las bases de datos
for database in self.databases:
if 'changed_on' in database:
database['changed_on'] = self.format_date(
database['changed_on'],
input_format='%Y-%m-%dT%H:%M:%S.%f',
output_format='%d/%m/%Y %H:%M:%S'
)
return self.databases

def prepare_connection(self):
""" Define the client and login if required """
Expand Down
2 changes: 1 addition & 1 deletion ckanext/superset/templates/superset/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h3>Datasets</h3>
{{ dataset.sql[:20] }} ...
{% endif %}
</td>
<td>{{ dataset.changed_on }}</td>
<td>{{ dataset.changed_on_delta_humanized }}</td>
<td>{{ dataset.database.database_name }} ({{ dataset.database.id }})</td>
</tr>
{% endfor %}
Expand Down

0 comments on commit a7c8107

Please sign in to comment.