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

ODPSH-31

parent 9d183318
Branches
Tags
No related merge requests found
No preview for this file type
...@@ -439,6 +439,15 @@ msgstr "Fertig" ...@@ -439,6 +439,15 @@ msgstr "Fertig"
msgid "Data Proposal" msgid "Data Proposal"
msgstr "Datenvorschlag" msgstr "Datenvorschlag"
msgid "Create Data Proposal"
msgstr "Datensatz vorschlagen"
msgid "Close Data Proposal"
msgstr "Datenvorschlag abschließen"
msgid "Edit Data Proposal"
msgstr "Datenvorschlag bearbeiten"
msgid "No data proposal found" msgid "No data proposal found"
msgstr "Kein Datenvorschlag gefunden" msgstr "Kein Datenvorschlag gefunden"
......
...@@ -367,6 +367,9 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm ...@@ -367,6 +367,9 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
m.connect('user_datasets', '/user/{id:.*}', action='read', m.connect('user_datasets', '/user/{id:.*}', action='read',
ckan_icon='sitemap') ckan_icon='sitemap')
map.connect('comment_datarequest', '/datarequest/new',
controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
action='new', conditions=dict(method=['GET', 'POST']), ckan_icon='comment')
map.connect('comment_datarequest', '/datarequest/{id}', map.connect('comment_datarequest', '/datarequest/{id}',
controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
action='comment', conditions=dict(method=['GET', 'POST']), ckan_icon='comment') action='comment', conditions=dict(method=['GET', 'POST']), ckan_icon='comment')
......
...@@ -1959,16 +1959,15 @@ p.package-info-categorie ...@@ -1959,16 +1959,15 @@ p.package-info-categorie
background-color: #003064; background-color: #003064;
} }
.label.label-open .label.label-closed
{ {
color: white; color: white;
background-color: #003064; background-color: #DBDBDB;
} }
.label.label-closed .datarequest .dataset-heading .label
{ {
color: white; vertical-align: top;
background-color: #DBDBDB;
} }
.datarequest-subtitle .datarequest-subtitle
...@@ -2077,3 +2076,10 @@ p.package-info-categorie ...@@ -2077,3 +2076,10 @@ p.package-info-categorie
{ {
margin-top: 10px; margin-top: 10px;
} }
.datarequest .dataset-form{
width: 715px;
}
.datarequest .dataset-form .row-fluid .span6 {
width: 715px;
}
{% extends "datarequests/base.html" %}
{% block subtitle %}{{ _('Close Data Proposal') }}{% endblock %}
{% block breadcrumb_content %}
<li>{% link_for _('Data Proposal'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index' %}</li>
<li>{% link_for c.datarequest.get('title')|truncate(30), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=c.datarequest.get('id') %}</li>
<li class="active"><a href="">{{ _('Close Data Proposal') }}</a></li>
{% endblock %}
{% block primary_content_inner %}
<h1 class="{% block page_heading_class %}page-heading{% endblock %}">{% block page_heading %}{{ _('Close Data Proposal') }}{% endblock %}</h1>
{% snippet "datarequests/snippets/close_datarequest_form.html", datarequest=c.datarequest, datasets=c.datasets, errors=c.errors, errors_summary=c.errors_summary %}
{% endblock %}
{% block page_header %}{% endblock %}
\ No newline at end of file
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<div class="dataset-details"> <div class="dataset-details">
{% if c.datarequest.get('closed', False) %} {% if c.datarequest.get('closed', False) %}
<div class="label label-closed"> <div class="label label-closed">
{% trans %}Closed{% endtrans %} {% trans %}Done{% endtrans %}
</div> </div>
{% else %} {% else %}
<div class="label label-open"> <div class="label label-open">
......
{% extends "datarequests/base.html" %}
{% block subtitle %}{{ _('Edit Data Proposal') }}{% endblock %}
{% block breadcrumb_content %}
<li>{% link_for _('Data Proposal'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index' %}</li>
<li>{% link_for c.original_title|truncate(30), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=c.datarequest.get('id') %}</li>
<li class="active"><a href="">{{ _('Edit Data Proposal') }}</a></li>
{% endblock %}
{% block primary_content_inner %}
<h1 class="{% block page_heading_class %}page-heading{% endblock %}">{% block page_heading %}{{ _('Edit Data Proposal') }}{% endblock %}</h1>
{% snippet "datarequests/snippets/edit_datarequest_form.html", data=c.datarequest, errors=c.errors, errors_summary=c.errors_summary, offering=c.offering %}
{% endblock %}
{% block page_header %}{% endblock %}
\ No newline at end of file
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
{% block subtitle %}{{ _('Create Data Request') }}{% endblock %} {% block subtitle %}{{ _('Create Data Request') }}{% endblock %}
{% block breadcrumb_content %} {% block breadcrumb_content %}
<li>{% link_for _('Data Requests'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index' %}</li> <li>{% link_for _('Data Proposal'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index' %}</li>
<li class="active"><a href="">{{ _('Create Data Request') }}</a></li> <li class="active"><a href="">{{ _('Create Data Proposal') }}</a></li>
{% endblock %} {% endblock %}
{% block primary_content_inner %} {% block primary_content_inner %}
...@@ -12,9 +12,7 @@ ...@@ -12,9 +12,7 @@
{% snippet "datarequests/snippets/new_datarequest_form.html", data=c.datarequest, errors=c.errors, errors_summary=c.errors_summary, offering=c.offering %} {% snippet "datarequests/snippets/new_datarequest_form.html", data=c.datarequest, errors=c.errors, errors_summary=c.errors_summary, offering=c.offering %}
{% endblock %} {% endblock %}
{% block secondary_content_additional_info %} {% block secondary %}
<p>{% trans %}To create a data request, fill the form and specify a title and a description for your request. Please, be as clear as you can in order to ease the task of accomplishing your request. You can also specify an organization if your data request is closely related with it. {% endtrans %}
</p>
{% endblock %} {% endblock %}
{% block page_header %}{% endblock %} {% block page_header %}{% endblock %}
\ No newline at end of file
...@@ -4,22 +4,21 @@ ...@@ -4,22 +4,21 @@
{% set description = data.get('description', '') %} {% set description = data.get('description', '') %}
{% set organization_id = data.get('organization_id', h.get_request_param('organization')) %} {% set organization_id = data.get('organization_id', h.get_request_param('organization')) %}
{% set organizations_available = h.organizations_available('read') %} {% set organizations_available = h.organizations_available('read') %}
{% set form_horizontal = 'form-horizontal' if h.ckan_version()[:3] <= '2.7' else '' %}
{# This provides a full page that renders a form for publishing a dataset. It can {# This provides a full page that renders a form for publishing a dataset. It can
then itself be extended to add/remove blocks of functionality. #} then itself be extended to add/remove blocks of functionality. #}
<form class="dataset-form {{ form_horizontal }}" method="post" data-module="basic-form" action enctype="multipart/form-data"> <form class="dataset-form" method="post" data-module="basic-form" action enctype="multipart/form-data">
<input type="hidden" id="id" name="id" value="{{ data.get('id', '') }}" /> <input type="hidden" id="id" name="id" value="{{ data.get('id', '') }}" />
{% block errors %}{{ form.errors(errors_summary) }}{% endblock %} {% block errors %}{{ form.errors(errors_summary) }}{% endblock %}
{% block offering_title %} {% block offering_title %}
{{ form.input('title', id='field-title', label=_('Title'), placeholder=_('eg. Data Request Name'), value=title, error=errors['Title'], classes=['control-full', 'control-large'], is_required=true) }} {{ form.input('title', id='field-title', label=_('Title'), placeholder=_('eg. Data Request Name'), value=title, error=errors['Title'], classes=['control-full'], is_required=true) }}
{% endblock %} {% endblock %}
{% block offering_description %} {% block offering_description %}
{{ form.markdown('description', id='field-description', label=_('Description'), placeholder=_('eg. Data Request description'), value=description, error=errors['Description']) }} {{ form.markdown('description', id='field-description', label=_('Description'), placeholder=_('eg. Data Request description'), value=description, error=errors['Description'], is_required=true) }}
{% endblock %} {% endblock %}
...@@ -31,7 +30,7 @@ then itself be extended to add/remove blocks of functionality. #} ...@@ -31,7 +30,7 @@ then itself be extended to add/remove blocks of functionality. #}
<a class="btn btn-danger pull-left" href="{% url_for controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='delete', id=data.get('id') %}" data-module="confirm-action" data-module-i18n="{{ locale }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a> <a class="btn btn-danger pull-left" href="{% url_for controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='delete', id=data.get('id') %}" data-module="confirm-action" data-module-i18n="{{ locale }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
<button class="btn btn-primary" type="submit" name="save">{% block save_button_text %}{{ _('Create Data Request') }}{% endblock %}</button> <button class="btn btn-primary btn-arrow-right" type="submit" name="save">{% block save_button_text %}{{ _('Create Data Request') }}{% endblock %}</button>
</div> </div>
{% endblock %} {% endblock %}
......
...@@ -38,8 +38,9 @@ class TestDatarequest: ...@@ -38,8 +38,9 @@ class TestDatarequest:
form['description'] = markdown form['description'] = markdown
final_response = self.app.submit_form(form) final_response = self.app.submit_form(form)
id = re.search( id = re.search(
'/datarequest/comment/([a-zA-Z0-9\-]*)">', final_response.body).group(1) '/datarequest/edit/([a-zA-Z0-9\-]*)">', final_response.body).group(1)
return id return id
def test_create_datarequest(self): def test_create_datarequest(self):
...@@ -50,6 +51,22 @@ class TestDatarequest: ...@@ -50,6 +51,22 @@ class TestDatarequest:
response = self.app.get('/datarequest') response = self.app.get('/datarequest')
assert id in response assert id in response
def test_edit_datarequest(self):
# Arrange
id = self._create_request()
# Act
response = self.app.get('/datarequest/edit/'+id)
form = response.forms[0]
form['title'] = id+'edit_title'
form['description'] = id+'edit_desc'
final_response = self.app.submit_form(form)
# Assert
response = self.app.get('/datarequest/'+id)
assert id+'edit_title' in response
assert id+'edit_desc' in response
def test_comment_datarequest(self): def test_comment_datarequest(self):
# Arrange # Arrange
id = self._create_request() id = self._create_request()
...@@ -64,6 +81,19 @@ class TestDatarequest: ...@@ -64,6 +81,19 @@ class TestDatarequest:
# Assert # Assert
assert guid in final_response assert guid in final_response
def test_close_datarequest(self):
# Arrange
id = self._create_request()
# Act
response = self.app.get('/datarequest/close/'+id)
form = response.forms[0]
final_response = self.app.submit_form(form)
# Assert
response = self.app.get('/datarequest/'+id)
assert 'label-closed' in response
def _get_app(self): def _get_app(self):
if not hasattr(self, 'app'): if not hasattr(self, 'app'):
app = AppProxy() app = AppProxy()
......
...@@ -5,6 +5,7 @@ from ckan.common import config ...@@ -5,6 +5,7 @@ from ckan.common import config
import ckan.config.middleware import ckan.config.middleware
import ckan.tests.helpers as helpers import ckan.tests.helpers as helpers
import sys import sys
import pdb
def odsh_test(): def odsh_test():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment