Skip to content
Snippets Groups Projects
Commit bf833598 authored by anonymous's avatar anonymous
Browse files

fix datetime

parent 02a58458
No related branches found
No related tags found
No related merge requests found
...@@ -6,6 +6,8 @@ import ckan.logic as logic ...@@ -6,6 +6,8 @@ import ckan.logic as logic
import ckan.model as model import ckan.model as model
import json import json
from ckan.common import c from ckan.common import c
import datetime
from dateutil import parser
get_action = logic.get_action get_action = logic.get_action
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
...@@ -92,3 +94,7 @@ def odsh_get_spatial_text(pkg_dict): ...@@ -92,3 +94,7 @@ def odsh_get_spatial_text(pkg_dict):
spatial=f['value'] spatial=f['value']
return spatial return spatial
return None return None
def odsh_render_datetime(datetime_, date_format='%d.%m.%Y'):
dt = parser.parse(datetime_)
return dt.strftime(date_format)
\ No newline at end of file
...@@ -134,7 +134,8 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm ...@@ -134,7 +134,8 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
'odsh_get_resource_details': odsh_helpers.odsh_get_resource_details, 'odsh_get_resource_details': odsh_helpers.odsh_get_resource_details,
'odsh_get_resource_views': odsh_helpers.odsh_get_resource_views, 'odsh_get_resource_views': odsh_helpers.odsh_get_resource_views,
'odsh_get_bounding_box': odsh_helpers.odsh_get_bounding_box, 'odsh_get_bounding_box': odsh_helpers.odsh_get_bounding_box,
'odsh_get_spatial_text': odsh_helpers.odsh_get_spatial_text 'odsh_get_spatial_text': odsh_helpers.odsh_get_spatial_text,
'odsh_render_datetime': odsh_helpers.odsh_render_datetime
} }
def before_map(self, map): def before_map(self, map):
......
...@@ -52,16 +52,17 @@ Example: ...@@ -52,16 +52,17 @@ Example:
{% block timerange %} {% block timerange %}
<div class="timerange-detail info-detail"> <div class="timerange-detail info-detail">
<div>{{ _('timerange') }}:</div> <div>{{ _('timerange') }}:</div>
{%set start=h.render_datetime(pkg.temporal_start,'%d.%m.%Y') if pkg.temporal_start else ''%} {%set start=h.odsh_render_datetime(pkg.temporal_start) if pkg.temporal_start else ''%}
{%set end=h.render_datetime(pkg.temporal_end,'%d.%m.%Y') if pkg.temporal_end else ''%} {%set end=h.odsh_render_datetime(pkg.temporal_end) if pkg.temporal_end else ''%}
<p>{{ start }} - {{ end }}</p> <p>{{ start }} - {{ end }}</p>
</div> </div>
{% endblock %} {% endblock %}
{% block last_change %} {% block last_change %}
<div class="last-change-detail info-detail"> <div class="last-change-detail info-detail">
{%set issued=h.odsh_render_datetime(pkg.issued) if pkg.issued else '-'%}
<div>{{ _('issued') }}:</div> <div>{{ _('issued') }}:</div>
{{h.render_datetime(pkg.issued,'%d.%m.%Y') }} {{issued}}
</div> </div>
{% endblock %} {% endblock %}
......
...@@ -20,15 +20,15 @@ Example: ...@@ -20,15 +20,15 @@ Example:
{% set license_title =package.license_title if package.license_title else '-'%} {% set license_title =package.license_title if package.license_title else '-'%}
{% set license_name=' ('+package.licenseAttributionByText +')' if package.licenseAttributionByText else ''%} {% set license_name=' ('+package.licenseAttributionByText +')' if package.licenseAttributionByText else ''%}
{% set license = license_title + license_name %} {% set license = license_title + license_name %}
{% set start=h.render_datetime(package.temporal_start,'%d.%m.%Y') if package.temporal_start else ''%} {% set start=h.odsh_render_datetime(package.temporal_start) if package.temporal_start else ''%}
{% set end=h.render_datetime(package.temporal_end,'%d.%m.%Y') if package.temporal_end else ''%} {% set end=h.odsh_render_datetime(package.temporal_end) if package.temporal_end else ''%}
{% set timerange = start + '-' + end%} {% set timerange = start + '-' + end%}
{% set org = package.organization.title or package.organization.name or '-' %} {% set org = package.organization.title or package.organization.name or '-' %}
{% set stars = h.odsh_openness_score_dataset_html(package) %} {% set stars = h.odsh_openness_score_dataset_html(package) %}
{% set access_count=(package.tracking_summary.total if package.tracking_summary) or '-' %} {% set access_count=(package.tracking_summary.total if package.tracking_summary) or '-' %}
{% set timerange_label ='Zeitraum' %} {% set timerange_label ='Zeitraum' %}
{% set access_count_label ='Aufrufe' %} {% set access_count_label ='Aufrufe' %}
{% set issued = h.render_datetime(package.issued,'%d.%m.%Y') %} {% set issued = h.odsh_render_datetime(package.issued) if package.issued else '-'%}
{% set categories = package.groups|map(attribute='display_name')|join(', ') if package.groups else '-' %} {% set categories = package.groups|map(attribute='display_name')|join(', ') if package.groups else '-' %}
{% block package_item %} {% block package_item %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment