Skip to content
Snippets Groups Projects
Commit b9a08816 authored by Fabrice Salvaire's avatar Fabrice Salvaire
Browse files

improved member pages

parent 415592bf
No related branches found
No related tags found
No related merge requests found
......@@ -7,12 +7,24 @@
{# <link rel="stylesheet" href={{ static('css-ext/select2-bootstrap4.min.css') }}> #}
{% endblock %}
{% block script %}
{# after JQuery #}
<script type="text/javascript" src={{ static('js-ext/select2.min.js') }}></script>
<script type="text/javascript" src={{ static('js/member_details.js') }}></script>
</script>
{% endblock %}
{% block title %} - {{ member.name }}{% endblock %}
{% block breadcrumb %}
{% endblock %}
{#
{% block breadcrumb_li %}
<li class="breadcrumb-item"><a href="{{ url('member.index') }}">{{ _('Members') }}</a></li>
<li class="breadcrumb-item active">{{ member.last_first_name }}</li>
{% endblock %}
#}
{% block content %}
{% set club_member = member.club_member %}
......@@ -22,22 +34,38 @@
href=url('member.delete', member.pk),
) }}
{# <h2>{{member.last_first_name}} {{ update_delete_button_group(href=url('member.update', member.pk)) }}</h2> #}
<h2>{{member.last_name}} ~ {{member.first_name}} {{ update_delete_button_group(href=url('member.update', member.pk)) }}</h2>
<select id="autocomplete-member" style="width: 50%">
<option value={{member.pk}} selected="selected">{{ member.last_first_name }}</option>
</select>
<div class="container-fluid pt-3">
{#
<div class="d-flex flex-row pb-3">
<div>
# <h2>{{member.last_first_name}} {{ update_delete_button_group(href=url('member.update', member.pk)) }}</h2> #
<h2>{{member.last_name}} ~ {{member.first_name}} {{ update_delete_button_group(href=url('member.update', member.pk)) }}</h2>
</div>
<div class="ml-auto p-2" style="width: 30rem">
<select id="autocomplete-member" style="width: 100%">
<option value={{member.pk}} selected="selected">{{ member.last_first_name }}</option>
</select>
</div>
</div>
#}
<div class="d-flex flex-row pb-3">
<div>
<select id="autocomplete-member" style="width: 30rem">
<option value={{member.pk}} selected="selected">{{ member.last_first_name }}</option>
</select>
</div>
<div class="ml-auto p-2">
{{ update_delete_button_group(href=url('member.update', member.pk)) }}
</div>
</div>
<div class="row">
<div class="col-sm-4">
<h3>{{_('Identity')}}</h3>
<dl class="row">
<dt class="col-sm-4">{{ _('User Name') }}</dt><dd class="col-sm-8">{{ member.user.username }}</dd>
{# <dt class="col-sm-4">{{ _('Last Name') }}</dt><dd class="col-sm-8">{{ member.last_name }}</dd> #}
{# <dt class="col-sm-4">{{ _('First Name') }}</dt><dd class="col-sm-8">{{ member.first_name }}</dd> #}
<dt class="col-sm-4">{{ _('Last Name') }}</dt><dd class="col-sm-8">{{ member.last_name }}</dd>
<dt class="col-sm-4">{{ _('First Name') }}</dt><dd class="col-sm-8">{{ member.first_name }}</dd>
<dt class="col-sm-4">{{ _('Birth Date') }}</dt><dd class="col-sm-8">{{ member.birth_date }}</dd>
<dt class="col-sm-4">{{ _('Age') }}</dt><dd class="col-sm-8">{{ member.age }}</dd>
<dt class="col-sm-4">{{ _('Sex') }}</dt><dd class="col-sm-8">{{ member.get_sex_display() }}</dd>
......@@ -91,43 +119,3 @@
</div>
</dl>
{% endblock %}
{% block script %}
{# after JQuery #}
<script src={{ static('js-ext/select2.min.js') }}></script>
<script type="text/javascript">
$(document).ready(function() {
$('#autocomplete-member').select2({
ajax: {
url: '/api/member_auto_complete/',
dataType: 'json',
data: function (params) {
var query = {
search: params.term,
}
return query;
},
processResults: function (data) {
var members = data.results;
console.log(members);
var results = [];
for (var i = 0; i < members.length; i++) {
var member = members[i];
results.push({
id: member.pk,
text: member.last_first_name
})
}
return {
results: results
};
}
}
}).on('change', function() {
console.log(this.value);
{# {{ url('member.details') }} #}
window.location.replace("/member/" + this.value);
});
});
</script>
{% endblock %}
......@@ -27,7 +27,7 @@
<script type="text/javascript" src={{ static('js-ext/babel-polyfill.min.js') }}></script>
<script type="text/javascript" src={{ static('js/route_page_react.js') }}></script>
<script type="text/javascript" src={{ static('js/route_page.js') }}></script>
{% endblock %}
{% block title %} - {{ _('Routes') }}{% endblock %}
......
/***************************************************************************************************
*
* Climbing Asso Portal
* Copyright (C) 2018 Fabrice Salvaire
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
**************************************************************************************************/
$(document).ready(function() {
$('#autocomplete-member').select2({
ajax: {
url: '/api/member_auto_complete/',
dataType: 'json',
data: function (params) {
var query = {
search: params.term,
}
return query;
},
processResults: function (data) {
var members = data.results;
// console.log(members);
var results = [];
for (var i = 0; i < members.length; i++) {
var member = members[i];
results.push({
id: member.pk,
text: member.last_first_name
})
}
return {
results: results
};
}
}
}).on('change', function() {
// console.log(this.value);
// {{ url('member.details') }}
window.location.replace("/member/" + this.value);
});
});
......@@ -149,9 +149,10 @@ let config = {
entry: {
common: './src/common/index.js',
admin: './src/admin/index.js',
member_map: './src/pages/member_map/index.js',
member_map: './src/pages/member/map.js',
member_details: './src/pages/member/details.js',
rest_framework: './src/rest_framework/index.js',
route_page_react: './src/pages/wall/route-page.jsx',
route_page: './src/pages/wall/route-page.jsx',
select2_test: './src/pages/select2_test.js',
test: './src/test.js',
},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment