Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve #441: Improve relationship party selection widget #542

Merged
merged 1 commit into from
Aug 11, 2016
Merged

Resolve #441: Improve relationship party selection widget #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions cadasta/core/static/css/main.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 37 additions & 3 deletions cadasta/core/static/css/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,8 +1177,7 @@ img.org-logo, img#org-logo {
}
}

button#add-contact,
button#add-party { // below contacts table and party table
button#add-contact { // below contacts table
padding: 0;
}

Expand Down Expand Up @@ -1324,7 +1323,7 @@ div.add-btn-btm { // add party link at bottom of table
min-width: 100px;
}
}
button#add-contact, button#add-party {
button#add-contact {
background: transparent;
color: $link-color !important;
border: 0;
Expand Down Expand Up @@ -1380,3 +1379,38 @@ tr.contacts-error {
background: $alert-warning-bg;
}
}

/* =Party selection widget
-------------------------------------------------------------- */

#select-party {
label {
display: block;
}
#party-select {
width: 100%;
}
.select2 {
display: block;
margin: 0.5em 0;
width: 100%;
}
#add-party {
padding: 6px 18px;
.glyphicon {
opacity: 0.5;
padding-right: 8px;
}
}
}

.select2-container {
.party-name {
display: block;
}
.party-type {
display: block;
font-size: 0.85em;
opacity: 0.75;
}
}
24 changes: 13 additions & 11 deletions cadasta/spatial/tests/test_widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,22 @@ def test_render(self):

widget = SelectPartyWidget(project=project)
rendered = widget.render(name='name', value='value')
assert '<input type="hidden" name="name" value="value">' in rendered
assert ('<tr data-id="' + party_1.id + '"><td>' + party_1.name + ''
'</td><td>' + party_1.get_type_display() + '</td><tr>'
in rendered)
assert ('<tr data-id="' + party_2.id + '"><td>' + party_2.name + ''
'</td><td>' + party_2.get_type_display() + '</td><tr>'
in rendered)
assert ('<select id="party-select" name="name">' in rendered)
assert ('<option value="' + party_1.id + '" data-type="'
'' + party_1.get_type_display() + '">' + party_1.name + ''
'</option>' in rendered)
assert ('<option value="' + party_2.id + '" data-type="'
'' + party_2.get_type_display() + '">' + party_2.name + ''
'</option>' in rendered)


class NewEntityWidgetTest(TestCase):
def test_render_value(self):
widget = NewEntityWidget()
expected = (
'<button class="btn btn-link"'
' id="add-party" type="button">Add party</button>'
'<button class="btn btn-default" id="add-party" type="button">'
'<span class="glyphicon glyphicon-plus" aria-hidden="true">'
'</span> Add party</button>'
'<input id="new_entity_field" type="hidden"'
' name="name" value="value">'
)
Expand All @@ -36,8 +37,9 @@ def test_render_value(self):
def test_render_no_value(self):
widget = NewEntityWidget()
expected = (
'<button class="btn btn-link"'
' id="add-party" type="button">Add party</button>'
'<button class="btn btn-default" id="add-party" type="button">'
'<span class="glyphicon glyphicon-plus" aria-hidden="true">'
'</span> Add party</button>'
'<input id="new_entity_field" type="hidden"'
' name="name" value="">'
)
Expand Down
34 changes: 14 additions & 20 deletions cadasta/spatial/widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.forms.widgets import HiddenInput
from django.utils.translation import ugettext as _
from party.models import Party


Expand All @@ -9,26 +10,15 @@ def __init__(self, project, *args, **kwargs):

def render(self, name, value, attrs={}):
prj_parties = Party.objects.filter(project_id=self.project)
parties = ['<tr data-id="' + p.id + '"><td>' + p.name + '</td>'
'<td>' + p.get_type_display() + '</td><tr>'
parties = ['<option value="' + p.id + '" data-type="' +
p.get_type_display() + '">' + p.name + '</option>'
for p in prj_parties]

return (
'<table class="table" id="select-list">'
' <thead>'
' <tr>'
' <th>Party</th>'
' <th>Type</th>'
' </tr>'
' </thead>'
' <tbody>'
' {parties}'
' </tbody>'
'</table>'
'<input type="hidden" name="{name}" value="{value}">'
).format(parties=''.join(parties),
name=name,
value=value or '')
'<select id="party-select" name="{name}">'
'{parties}'
'</select>'
).format(parties=''.join(parties), name=name)


class NewEntityWidget(HiddenInput):
Expand All @@ -37,10 +27,14 @@ class Media:

def render(self, name, value, attrs={}):
html = (
'<button class="btn btn-link"'
' id="add-party" type="button">Add party</button>'
'<button class="btn btn-default" id="add-party" type="button">'
'<span class="glyphicon glyphicon-plus" aria-hidden="true">'
'</span> {button_text}</button>'
'<input id="new_entity_field" type="hidden"'
' name="{name}" value="{value}">'
)
button_text = _("Add party")

return html.format(name=name, value=(value if value else ''))
return html.format(name=name,
value=(value if value else ''),
button_text=button_text)
32 changes: 28 additions & 4 deletions cadasta/templates/spatial/relationship_add.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,33 @@

{% block page_title %}Add new relationship | {% endblock %}

{% block extra_head %}
{{ block.super }}
<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/css/select2.min.css" rel="stylesheet" />
{% endblock %}

{% block location_extra_script %}
{{ form.media }}
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/js/select2.min.js"></script>
<script>
$(document).ready(function() {
var template = function(party) {
if (!party.id) {
return party.text;
}
return $(
'<div class="party-option">' +
'<strong class="party-name">' + party.text + '</strong>' +
'<span class="party-type">' + party.element.dataset.type + '</span>' +
'</div>'
);
};
$("#party-select").select2({
minimumResultsForSearch: 6,
templateResult: template,
});
});
</script>
{% endblock %}

{% block form_modal %}
Expand All @@ -26,11 +51,10 @@ <h3 class="modal-title">{% trans "Add new relationship" %}</h3>

<h4 class="step">{% trans "1. Connected party" %}</h4>
<div id="select-party" class="clearfix">
<label>Choose a party to connect to this location</label>
<label>{% trans "Choose an existing party to connect to this location" %}</label>
{% render_field form.id class+="form-control" %}
<div class="add-btn-btm clearfix">
{% render_field form.new_entity class+="form-control" %}
</div>
<label>{% trans "Or add a new party" %}</label>
{% render_field form.new_entity class+="form-control" %}
</div>

<div id="new-item" class="clearfix{% if not form.new_entity.value %} hidden{% endif %}">
Expand Down