Merge pull request #244 from dpc-sdp/SXDEDPCXZIC-390

Sxdedpcxzic 390

Author: iaroslav13

ckanext/datavic_odp_theme/grunt/sass/_resources.scss

@@ -207,6 +207,11 @@ $primary-color: #0052C2;
             margin-bottom: 0;
         }
     }
+    .data-dictionary-table {
+        thead {
+            background-color: #f2f2f2;
+        }
+    }
 }
 
 @media (min-width: 576px) {

ckanext/datavic_odp_theme/helpers.py

@@ -260,3 +260,12 @@ def datavic_update_org_error_dict(
         )]
 
     return error_dict
+
+@helper
+def resource_attributes(attrs):
+    try:
+        attrs = json.loads(attrs)
+    except ValueError:
+        return None
+
+    return attrs

ckanext/datavic_odp_theme/templates/scheming/package/resource_read.html

@@ -0,0 +1,120 @@
+{% extends "package/resource_read.html" %}
+
+{%- set exclude_fields = [
+  'name',
+  'description',
+  'url',
+  'format',
+  ] -%}
+{%- set schema = h.scheming_get_dataset_schema(dataset_type) -%}
+
+{% block resource_additional_information_inner %}
+  {% if res.attributes %}
+    {% set res_attrs = h.resource_attributes(res.attributes) %}
+    {% if res_attrs %}
+      <div class="module-content">
+        <h2>{{ _('Data Dictionary') }}</h2>
+        <table class="table table-bordered table-condensed data-dictionary-table" data-module="table-toggle-more">
+          <thead>
+            {% block resouce_data_dictionary_headers %}
+            <tr>
+              <th scope="col">{{ _('Column') }}</th>
+              <th scope="col">{{ _('Name') }}</th>
+              <th scope="col">{{ _('Type') }}</th>
+              <th scope="col">{{ _('Description') }}</th>
+              <th scope="col">{{ _('Fixed Values') }}</th>
+            </tr>
+            {% endblock %}
+          </thead>
+          {% for attr in res_attrs %}
+            <tr>
+              <td>{{ attr.db_name }}</td>
+              <td>{{ attr.name }}</td>
+              <td>{{ attr.db_format }}</td>
+              <td>{{ attr.definition }}</td>
+              <td>{{ attr.fixed_values }}</td>
+            </tr>
+          {% endfor %}
+        </table>
+      </div>
+    {% endif %}
+  {% else %}
+    {% if res.datastore_active %}
+      {% block resource_data_dictionary %}
+        {{ super() }}
+      {% endblock %}
+    {% endif %}
+  {% endif %}
+
+  <div class="module-content">
+    {%- block additional_info_heading -%}<h2>{{ _('Additional Information') }}</h2>{%- endblock -%}
+    <table class="table table-striped table-bordered table-condensed" data-module="table-toggle-more">
+      {%- block additional_info_table_head -%}
+        <thead>
+          <tr>
+            <th scope="col">{{ _('Field') }}</th>
+            <th scope="col">{{ _('Value') }}</th>
+          </tr>
+        </thead>
+      {%- endblock -%}
+      <tbody>
+        {%- block resource_last_updated -%}
+        <tr>
+          <th scope="row">{{ _('Data last updated') }}</th>
+          <td>{{ h.render_datetime(res.last_modified) or h.render_datetime(res.created) or _('unknown') }}</td>
+        </tr>
+        {%- endblock -%}
+        {%- block resource_metadata_last_updated -%}
+        <tr>
+          <th scope="row">{{ _('Metadata last updated') }}</th>
+          <td>{{ h.render_datetime(res.metadata_modified) or h.render_datetime(res.created) or _('unknown') }}</td>
+        </tr>
+        {%- endblock -%}
+        {%- block resource_created -%}
+        <tr>
+          <th scope="row">{{ _('Created') }}</th>
+          <td>{{ h.render_datetime(res.created) or _('unknown') }}</td>
+        </tr>
+        {%- endblock -%}
+        {%- block resource_format -%}
+        <tr>
+          <th scope="row">{{ _('Format') }}</th>
+          <td>{{ res.format or res.mimetype_inner or res.mimetype or _('unknown') }}</td>
+        </tr>
+        {%- endblock -%}
+        {%- block resource_license -%}
+        <tr>
+          <th scope="row">{{ _('License') }}</th>
+          <td>{% snippet "snippets/license.html", pkg_dict=pkg, text_only=True %}</td>
+        </tr>
+        {%- endblock -%}
+        {%- block resource_more_items -%}
+          {% for key, value in h.format_resource_items(res.items()) %}
+            {% if key not in ('created', 'metadata modified', 'last modified', 'format') %}
+              <tr class="toggle-more"><th scope="row">{{ key | capitalize }}</th><td>{{ value }}</td></tr>
+            {% endif %}
+          {% endfor %}
+        {%- endblock -%}
+        {%- block resource_fields -%}
+          {%- for field in schema.resource_fields -%}
+            {%- if field.field_name not in exclude_fields
+                and field.display_snippet is not none -%}
+              <tr>
+                <th scope="row">
+                  {{- h.scheming_language_text(field.label) -}}
+                </th>
+                <td>
+                  {%- snippet 'scheming/snippets/display_field.html',
+                      field=field, data=res, entity_type='dataset',
+                      object_type=dataset_type -%}
+                </td>
+              </tr>
+            {%- endif -%}
+          {%- endfor -%}
+        {%- endblock -%}
+      </tbody>
+    </table>
+
+
+  </div>
+{% endblock %}

ckanext/datavic_odp_theme/webassets/css/datavic_odp_theme.css

@@ -1783,6 +1783,9 @@ nav {
 .resource-read .table.table-striped p {
   margin-bottom: 0; }
 
+.resource-read .data-dictionary-table thead {
+  background-color: #f2f2f2; }
+
 @media (min-width: 576px) {
   .api-modal {
     max-width: 80%; } }