From 8cc3a9b9dbc66ef7510b7b51a8ab498f151d725b Mon Sep 17 00:00:00 2001
From: anonymous <anonymous>
Date: Tue, 27 Nov 2018 10:44:27 +0100
Subject: [PATCH] ODPSH-138: add missing fields
---
ckanext/odsh/public/odsh.css | 3 +++
ckanext/odsh/templates/snippets/package_item.html | 12 ++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ckanext/odsh/public/odsh.css b/ckanext/odsh/public/odsh.css
index 03ac96db..c9f40b66 100644
--- a/ckanext/odsh/public/odsh.css
+++ b/ckanext/odsh/public/odsh.css
@@ -427,6 +427,9 @@ ul.dataset-resources {
font-size: 12px;
margin-bottom: 1px;
color: black;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
}
.toolbar .breadcrumb>li a {
diff --git a/ckanext/odsh/templates/snippets/package_item.html b/ckanext/odsh/templates/snippets/package_item.html
index 01eca2e2..232a6d6f 100644
--- a/ckanext/odsh/templates/snippets/package_item.html
+++ b/ckanext/odsh/templates/snippets/package_item.html
@@ -17,13 +17,19 @@ Example:
{% set truncate_title = truncate_title or 80 %}
{% set title = package.title or package.name %}
{% set notes = h.markdown_extract(package.notes, extract_length=truncate) %}
-{% set license = package.license or '-' %}
-{% set timerange = '-' %}
+{% set license_title =package.license_title if package.license_title else '-'%}
+{% set license_name=' ('+package.access_constraints +')' if package.access_constraints else ''%}
+{% set license = license_title + license_name %}
+{% set start=h.render_datetime(package.temporal_start,'%d.%m.%Y') if package.temporal_start else ''%}
+{% set end=h.render_datetime(package.temporal_end,'%d.%m.%Y') if package.temporal_end else ''%}
+{% set timerange = start + '-' + end%}
{% set org = package.organization.title or package.organization.name or '-' %}
{% set stars = h.odsh_openness_score_dataset_html(package) %}
{% set access_count=(package.tracking_summary.total if package.tracking_summary) or '-' %}
{% set timerange_label ='Zeitraum' %}
{% set access_count_label ='Aufrufe' %}
+{% set last_change = h.render_datetime(package.metadata_modified,'%d.%m.%Y') %}
+{% set categories = package.groups|map(attribute='display_name')|join(', ') if package.groups else '-' %}
{% block package_item %}
<div class="container-fluid odsh-dataset-item">
@@ -87,9 +93,11 @@ Example:
</div>
<div class="dataset-info">
+ <p>{{ _('Kategorie') }}: {{ categories}} </p>
<p> {{_('Lizenz')}}: {{license}}</p>
<p> {{_('Herausgeber')}}: {{org}} </p>
<p> {{timerange_label}}: {{timerange}}</p>
+ <p>{{ _('last change') }}: {{last_change }} </p>
</div>
{% endblock %}
{% endif %}
--
GitLab