Skip to content

Commit

Permalink
Merge pull request #407 from keitaroinc/metadata_fields
Browse files Browse the repository at this point in the history 
Changed order of fields in dataset and resource
  • Loading branch information
Pavle Jonoski committed Jun 23, 2020
2 parents 5f6d4de + a8f8749 commit 4d04eb1
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 62 deletions.
90 changes: 45 additions & 45 deletions ckanext/knowledgehub/templates/package/snippets/package_basic_fields.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,18 @@
{% set show_organizations_selector = organizations_available %}
{% set show_visibility_selector = dataset_has_organization or (organizations_available and (user_is_sysadmin or dataset_is_draft)) %}


{{ form.input('short_title', id='field-short-title', label=_('Short Title'), placeholder=_('eg. A short title'), value=data.short_title, error=errors.short_title) }}
{% block package_basic_fields_sensitivity %}
{{ form.input('data_sensitivity', id='field-data-sensitivity', label=_('Data Sensitivity'), placeholder=_('eg. Yes'), value=data.data_sensitivity, error=errors.data_sensitivity) }}
{% block package_basic_fields_unit_measurement %}
{{ form.input('unit_of_measurement', id='field-unit-of-measurement', label=_('Unit of Measurement'), placeholder=_('Unit of measurement / observation for the dataset'),
value=data.unit_of_measurement, error=errors.unit_of_measurement, is_required=true) }}
{% endblock %}


{{ form.input('data_collector', id='field-data-collector', label=_('Data Collector'), placeholder=_('Which organization owns/collected the data'), value=data.data_collector, error=errors.data_collector, classes=['control-full'], is_required=true) }}


{% block basic_fields_external_access %}
{% set options = ['Not Available', 'Direct Access', 'Public Use', 'Licensed Use', 'Data Enclave', 'Open Access'] %}
<div class="control-group">
<label class="control-label" for="field-external-access">{{ _("External Access") }}</label>
<label class="control-full" for="field-external-access">{{ _("External Access Level") }}</label>
<div class="controls">
<select id="field-external_access" name="external_access" data-module="autocomplete">
{% for acc in options %}
Expand All @@ -38,6 +37,46 @@
</div>
{% endblock %}

{% block basic_fields_data_collection_technique %}
{% set options = ['Not specified', 'Face-to-face interview', 'Face-to-face interview: Computerised', 'Face-to-face interview: Mobile',
'Face-to-face interview: Paper-and-pencil', 'Telephone interview', 'E-mail interview', 'Self-administered questionnaire: E-mail',
'Self-administered questionnaire: Paper', 'Self-administered questionnaire: SMS/MMS',
'Web-based interview: audio-visual technology enabling the interviewer(s) and interviewee(s) to communicate in real time',
'Self-administered questionnaire: Computer-assisted', 'Self-administered questionnaire: Web-based', 'Face-to-face focus group',
'Telephone focus group', 'Observation', 'Other'] %}
<div class="control-group">
<label class="control-label" for="field-data-collection-technique" is_required="true">{{ _("Data Collection Technique") }}</label>
<div class="controls">
<select id="field-data-collection-technique" name="data_collection_technique" data-module="autocomplete">
{% for opt in options %}
<option value="{{ opt }}" {% if opt in data.get('data_collection_technique', []) %}selected="selected"{% endif %}>{{ opt }}</option>
{% endfor %}
</select>
</div>
</div>
{% endblock %}

{% block basic_fields_archived %}
{% set options = ['No', 'Yes'] %}
<div class="control-group">
<label class="control-label" for="field-archived">{{ _("Archived") }}</label>
<div class="controls">
<select id="field-archived" name="archived" data-module="autocomplete" is_required="true">
{% for opt in options %}
<option value="{{ opt }}" {% if opt in data.get('archived', []) %}selected="selected"{% endif %}>{{ opt }}</option>
{% endfor %}
</select>
</div>
</div>
{% endblock %}


{{ form.input('short_title', id='field-short-title', label=_('Short Title'), placeholder=_('eg. A short title'), value=data.short_title, error=errors.short_title) }}

{% block package_basic_fields_sensitivity %}
{{ form.input('data_sensitivity', id='field-data-sensitivity', label=_('Data Sensitivity'), placeholder=_('eg. Yes'), value=data.data_sensitivity, error=errors.data_sensitivity) }}
{% endblock %}

{% block package_basic_fields_original_id %}
{{ form.input('original_id', id='field-data-original-id', label=_('Original ID'), placeholder=_('If the dataset already has an ID '), value=data.original_id, error=errors.original_id) }}
{% endblock %}
Expand All @@ -47,11 +86,6 @@
{{ form.input('date_range_end', id='field-date-range-end', label=_('Date Range End'), placeholder=_('Date collection last date '), value=data.date_range_end, error=errors.date_range_end) }}
{% endblock %}

{% block package_basic_fields_unit_measurement %}
{{ form.input('unit_of_measurement', id='field-unit-of-measurement', label=_('Unit of Measurement'), placeholder=_('Unit of measurement / observation for the dataset'),
value=data.unit_of_measurement, error=errors.unit_of_measurement, is_required=true) }}
{% endblock %}

{% block package_basic_hxl_ated %}
{{ form.input('hxl_ated', id='field-hxl-ated', label=_("HXL-ated"), placeholder=_('Indicates if the dataset has HXL hashtags'), value=data.hxl_ated, error=errors.hxl_ated) }}
{% endblock %}
Expand All @@ -64,7 +98,6 @@
{{ form.input('linked_datasets', id='field-linked-datasets', label=_("Linked Datasets"), placeholder=_('Links to other RIDL datasets.'), value=data.linked_datasets, error=errors.linked_datasets) }}
{% endblock %}

{{ form.input('data_collector', id='field-data-collector', label=_('Data Collector'), placeholder=_('Which organization owns/collected the data'), value=data.data_collector, error=errors.data_collector, classes=['control-full'], is_required=true) }}


{% block basic_fields_process_status %}
Expand Down Expand Up @@ -96,26 +129,6 @@
</div>
{% endblock %}

{% block basic_fields_data_collection_technique %}
{% set options = ['Not specified', 'Face-to-face interview', 'Face-to-face interview: Computerised', 'Face-to-face interview: Mobile',
'Face-to-face interview: Paper-and-pencil', 'Telephone interview', 'E-mail interview', 'Self-administered questionnaire: E-mail',
'Self-administered questionnaire: Paper', 'Self-administered questionnaire: SMS/MMS',
'Web-based interview: audio-visual technology enabling the interviewer(s) and interviewee(s) to communicate in real time',
'Self-administered questionnaire: Computer-assisted', 'Self-administered questionnaire: Web-based', 'Face-to-face focus group',
'Telephone focus group', 'Observation', 'Other'] %}
<div class="control-group">
<label class="control-label" for="field-data-collection-technique" is_required="true">{{ _("Data Collection Technique") }}</label>
<div class="controls">
<select id="field-data-collection-technique" name="data_collection_technique" data-module="autocomplete">
{% for opt in options %}
<option value="{{ opt }}" {% if opt in data.get('data_collection_technique', []) %}selected="selected"{% endif %}>{{ opt }}</option>
{% endfor %}
</select>
</div>
</div>
{% endblock %}


{% block basic_fields_sampling_procedure %}
{% set options = ['Probability: Simple random', 'Probability: Systematic random', 'Probability: Stratified', 'Probability: Stratified: Proportional', 'Probability: Stratified: Disproportional', 'Probability: Cluster',
'Probability: Cluster: Simple random', 'Probability: Cluster: Stratified random', 'Probability: Multistage', 'Non-probability', 'Non-probability: Availability',
Expand Down Expand Up @@ -147,19 +160,6 @@
</div>
{% endblock %}

{% block basic_fields_archived %}
{% set options = ['No', 'Yes'] %}
<div class="control-group">
<label class="control-label" for="field-archived">{{ _("Archived") }}</label>
<div class="controls">
<select id="field-archived" name="archived" data-module="autocomplete" is_required="true">
{% for opt in options %}
<option value="{{ opt }}" {% if opt in data.get('archived', []) %}selected="selected"{% endif %}>{{ opt }}</option>
{% endfor %}
</select>
</div>
</div>
{% endblock %}

{% if show_organizations_selector and show_visibility_selector %}
<div data-module="dataset-visibility">
Expand Down
34 changes: 17 additions & 17 deletions ckanext/knowledgehub/templates/package/snippets/resource_form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,24 @@
<input type="hidden" name="validation_status" value="{{ data['validation_status'] }}" />
<input type="hidden" name="validation_timestamp" value="{{ data['validation_timestamp'] }}" />

{{ form.select('admin', id='field-resource-validation-admin', label=_('Request Resource Validation'), options=h.get_resource_validation_options(pkg_name), selected=data.admin, error=errors.resource_validation, classes=["control-medium"]) }}

{{ form.input('date_range_start', id='field-date-range-start', label=_('Date Range Start'), placeholder=_('Date collection first date '), value=data.date_range_start, error=errors.date_range_start, is_required=true) }}
{{ form.input('date_range_end', id='field-date-range-end', label=_('Date Range End'), placeholder=_('Date collection last date '), value=data.date_range_end, error=errors.date_range_end, is_required=true) }}

{% block basic_fields_file_type %}
{% set options = ['Microdata', 'Questionnaire', 'Report', 'Sampling strategy & methodology Description', 'Infographics & Dashboard',
'Other'] %}
<div class="control-group">
<label class="control-label" for="field-file-type" is_required="true">{{ _("File Type") }}</label>
<div class="controls">
<select id="field-file-type" name="file_type" data-module="autocomplete">
{% for opt in options %}
<option value="{{ opt }}" {% if opt in (data.get('file_type', []) or []) %}selected="selected"{% endif %}>{{ opt }}</option>
{% endfor %}
</select>
</div>
</div>
{% endblock %}

{% block resource_fields_process_status %}
{% set options = ['Raw-Uncleaned', 'Cleaned Only', 'Cleaned & Anonymized'] %}
<div class="control-group">
Expand Down Expand Up @@ -93,7 +106,7 @@
</div>
</div>
{% endblock %}

{% block package_basic_hxl_ated %}
{% set options = ['No', 'Yes'] %}
<div class="control-group">
Expand All @@ -108,21 +121,8 @@
</div>
{% endblock %}

{{ form.select('admin', id='field-resource-validation-admin', label=_('Request Resource Validation'), options=h.get_resource_validation_options(pkg_name), selected=data.admin, error=errors.resource_validation, classes=["control-medium"]) }}

{% block basic_fields_file_type %}
{% set options = ['Microdata', 'Questionnaire', 'Report', 'Sampling strategy & methodology Description', 'Infographics & Dashboard',
'Other'] %}
<div class="control-group">
<label class="control-label" for="field-file-type" is_required="true">{{ _("File Type") }}</label>
<div class="controls">
<select id="field-file-type" name="file_type" data-module="autocomplete">
{% for opt in options %}
<option value="{{ opt }}" {% if opt in (data.get('file_type', []) or []) %}selected="selected"{% endif %}>{{ opt }}</option>
{% endfor %}
</select>
</div>
</div>
{% endblock %}

{% endblock basic_fields %}

Expand Down

0 comments on commit 4d04eb1

Please sign in to comment.