mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

filters period

Browse Source
remotes/origin/stage5
ya_dim4ik 10 years ago
parent dd9c00614f
commit 919cf1bd63
7 changed files with 305 additions and 343 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      static/client/css/main.css
  2. 2
      static/client/css_min/main.min.css
  3. 203
      static/client/js/scripts.js
  4. 203
      static/client/js/vendor.js
  5. 16
      static/client/js_min/vendor.min.js
  6. 4
      templates/client/includes/events/filter_form.html
  7. 37
      templates/client/popups/filter_period.html

19
static/client/css/main.css
Unescape View File

@ -13130,7 +13130,13 @@ button.gray:hover {
margin-top: -15px; margin-top: -15px;
} }
.filters .links_block a{ .filters .period_block{
text-align: center;
margin-bottom: 30px;
}
.filters .links_block a,
.filters .period_block a{
display: inline-block; display: inline-block;
margin-bottom: 5px; margin-bottom: 5px;
text-decoration: none; text-decoration: none;
@ -13151,6 +13157,17 @@ button.gray:hover {
text-decoration: none; text-decoration: none;
} }
.filterPeriod{
display: none;
width: 530px;
}
label[for="id_date_from"],
label[for="id_date_to"],
#id_date_from,
#id_date_to{
display: none;
}

2
static/client/css_min/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

203
static/client/js/scripts.js
Unescape View File

@ -29,11 +29,71 @@ function set_filter_block_height () {
}); });
} }
function build_filters_period () {
// работа с ссылкой "уточнить дату в боковом фильтре"
var $period_link = $('#filter_period_trigger'),
$filters = $('#filter_form_wraper'),
$month_block = $filters.find('#id_month');
$period_link.insertAfter('#id_date_to').wrap($('<div></div>', {class: 'period_block'}));
if ($filters.find('#dateFrom').val() || $filters.find('#dateTo').val()){
$month_block.hide();
}
$('#filterPeriod').on('click', '.modal-approve', function(event) {
event.preventDefault();
if ($('#filterPeriod input[name="from"]').val().length || $('#filterPeriod input[name="to"]').val().length) {
var new_from_val = $('#filterPeriod input[name="from"]').val(),
new_to_val = $('#filterPeriod input[name="to"]').val();
$filters.find('#id_date_from input').val(new_from_val);
$filters.find('#id_date_to input').val(new_to_val);
$.fancybox.close();
submit_search_form ();
}
});
}
function submit_search_form () {
var $form = $('.filter_form'),
params = $form.serialize(),
filters_url = $form.data('formurl'),
results_url = $form.data('resultsurl'),
$loader = $('#wait-ajax');
$loader.show();
$('html, body').animate({scrollTop: $('.page-body').offset().top - 50}, 500);
$.getJSON(results_url, params, function(data) {
if (data.success) {
$('.page-body').html(data.results);
$loader.hide();
}
});
$.getJSON(filters_url, params, function (data) {
if (data.success){
$('#filter_form_wraper').html(data.form);
set_filter_block_height();
build_filters_period();
}
})
}
$(document).ready(function () { $(document).ready(function () {
set_filter_block_height(); set_filter_block_height();
$('#filter_form_wraper').on('click', '.show_more_link', function(e){ $('#filter_form_wraper')
.on('click', '.show_more_link', function(e){
e.preventDefault(); e.preventDefault();
var $block = $(this).parents('.filter_block'), var $block = $(this).parents('.filter_block'),
li_length = $block.find('li').length, li_length = $block.find('li').length,
@ -47,15 +107,13 @@ $(document).ready(function () {
} }
} }
}) })
.on('click', '.show_all_link', function(e){
$('#filter_form_wraper').on('click', '.show_all_link', function(e){
e.preventDefault(); e.preventDefault();
var $block = $(this).parents('.filter_block'); var $block = $(this).parents('.filter_block');
$block.find('li').fadeIn(200); $block.find('li').fadeIn(200);
$block.find('.links_block').hide(); $block.find('.links_block').hide();
}) })
.on('click', '#get_filters', function(event) {
$('#filter_form_wraper').on('click', '#get_filters', function(event) {
event.preventDefault(); event.preventDefault();
var search_string = '', var search_string = '',
$link = $(this); $link = $(this);
@ -87,9 +145,15 @@ $(document).ready(function () {
if (data.success) { if (data.success) {
$('#filter_form_wraper').html(data.form); $('#filter_form_wraper').html(data.form);
set_filter_block_height(); set_filter_block_height();
build_filters_period();
} }
}); });
})
.on('click', '#filter_period_trigger', function (event) {
event.preventDefault();
// $('#pwPeriod').fadeIn();
$.fancybox.open('#filterPeriod')
}); });
$('#get_filters').trigger('click'); $('#get_filters').trigger('click');
@ -115,90 +179,15 @@ $(document).ready(function () {
}); });
$('body').on('click', '#clearPeriod', function (event) {
event.preventDefault();
//$('ul.about_block_menu li.m_01').click(function () { $('#filter_form_wraper #id_date_from input').val('');
// $(this).parents('ul').find('li').removeClass('active'); $('#filter_form_wraper #id_date_to input').val('');
//$(this).addClass('active');
//$(this).parents('ul').removeClass('about_active'); $.fancybox.close();
//$('div.about_block').removeClass('about_show'); submit_search_form();
//$('div.team_about_block').addClass('about_show'); })
//$('div.parnters_about_block').removeClass('about_show');
//$('div.contacts_about_block').removeClass('about_show');
//$('div.review_about_block').removeClass('about_show');
//
//$('div.team_about_block_text').addClass('about_show');
//$('div.parnters_about_block_text').removeClass('about_show');
//$('div.contacts_about_block_text').removeClass('about_show');
//$('div.review_about_block_text').removeClass('about_show');
// return false;
//});
//
//$('ul.about_block_menu li.m_02').click(function () {
// $(this).parents('ul').find('li').removeClass('active');
//$(this).addClass('active');
//$(this).parents('ul').removeClass('about_active');
//$('div.about_block').removeClass('about_show');
//$('div.team_about_block').removeClass('about_show');
//$('div.parnters_about_block').addClass('about_show');
//$('div.contacts_about_block').removeClass('about_show');
//$('div.review_about_block').removeClass('about_show');
//
//$('div.team_about_block_text').removeClass('about_show');
//$('div.parnters_about_block_text').addClass('about_show');
//$('div.contacts_about_block_text').removeClass('about_show');
//$('div.review_about_block_text').removeClass('about_show');
// return false;
//});
//
//$('ul.about_block_menu li.m_03').click(function () {
// $(this).parents('ul').find('li').removeClass('active');
//$(this).addClass('active');
//$(this).parents('ul').removeClass('about_active');
//$('div.about_block').removeClass('about_show');
//$('div.team_about_block').removeClass('about_show');
//$('div.parnters_about_block').removeClass('about_show');
//$('div.contacts_about_block').addClass('about_show');
//$('div.review_about_block').removeClass('about_show');
//
//$('div.team_about_block_text').removeClass('about_show');
//$('div.parnters_about_block_text').removeClass('about_show');
//$('div.contacts_about_block_text').addClass('about_show');
//$('div.review_about_block_text').removeClass('about_show');
// return false;
//});
//
//$('ul.about_block_menu li.m_04').click(function () {
// $(this).parents('ul').find('li').removeClass('active');
//$(this).addClass('active');
//$(this).parents('ul').removeClass('about_active');
//$('div.about_block').removeClass('about_show');
//$('div.team_about_block').removeClass('about_show');
//$('div.parnters_about_block').removeClass('about_show');
//$('div.contacts_about_block').removeClass('about_show');
//$('div.review_about_block').addClass('about_show');
//
//$('div.team_about_block_text').removeClass('about_show');
//$('div.parnters_about_block_text').removeClass('about_show');
//$('div.contacts_about_block_text').removeClass('about_show');
//$('div.review_about_block_text').addClass('about_show');
// return false;
//});
//
//$('ul.about_block_menu li.m_05').click(function () {
// $(this).parents('ul').find('li').removeClass('active');
//$(this).parents('ul').addClass('about_active');
//$('div.about_block').addClass('about_show');
//$('div.team_about_block').removeClass('about_show');
//$('div.parnters_about_block').removeClass('about_show');
//$('div.contacts_about_block').removeClass('about_show');
//$('div.review_about_block').removeClass('about_show');
//
//$('div.team_about_block_text').removeClass('about_show');
//$('div.parnters_about_block_text').removeClass('about_show');
//$('div.contacts_about_block_text').removeClass('about_show');
//$('div.review_about_block_text').removeClass('about_show');
// return false;
//});
$('#filter_form_wraper').on('click', '.filter_block_label', function(event) { $('#filter_form_wraper').on('click', '.filter_block_label', function(event) {
@ -212,43 +201,7 @@ $(document).ready(function () {
$('#filter_form_wraper').on('change', 'input[type="checkbox"]', function(event) { $('#filter_form_wraper').on('change', 'input[type="checkbox"]', function(event) {
event.preventDefault(); event.preventDefault();
var $form = $('.filter_form'), submit_search_form();
params = $form.serialize(),
filters_url = $form.data('formurl'),
results_url = $form.data('resultsurl'),
$loader = $('#wait-ajax');
// form_done = false,
// results_done = false;
$loader.show();
$('html, body').animate({scrollTop: $('.page-body').offset().top - 50}, 500);
$.getJSON(results_url, params, function(data) {
if (data.success) {
//results_done = true;
$('.page-body').html(data.results);
// if (results_done && form_done){
// $loader.hide();
// }
$loader.hide();
}
});
$.getJSON(filters_url, params, function (data) {
if (data.success){
//form_done = true;
$('#filter_form_wraper').html(data.form);
set_filter_block_height();
// if (results_done && form_done){
// $loader.hide();
// }
}
})
}); });

203
static/client/js/vendor.js
Unescape View File

@ -4946,11 +4946,71 @@ function set_filter_block_height () {
}); });
} }
function build_filters_period () {
// работа с ссылкой "уточнить дату в боковом фильтре"
var $period_link = $('#filter_period_trigger'),
$filters = $('#filter_form_wraper'),
$month_block = $filters.find('#id_month');
$period_link.insertAfter('#id_date_to').wrap($('<div></div>', {class: 'period_block'}));
if ($filters.find('#dateFrom').val() || $filters.find('#dateTo').val()){
$month_block.hide();
}
$('#filterPeriod').on('click', '.modal-approve', function(event) {
event.preventDefault();
if ($('#filterPeriod input[name="from"]').val().length || $('#filterPeriod input[name="to"]').val().length) {
var new_from_val = $('#filterPeriod input[name="from"]').val(),
new_to_val = $('#filterPeriod input[name="to"]').val();
$filters.find('#id_date_from input').val(new_from_val);
$filters.find('#id_date_to input').val(new_to_val);
$.fancybox.close();
submit_search_form ();
}
});
}
function submit_search_form () {
var $form = $('.filter_form'),
params = $form.serialize(),
filters_url = $form.data('formurl'),
results_url = $form.data('resultsurl'),
$loader = $('#wait-ajax');
$loader.show();
$('html, body').animate({scrollTop: $('.page-body').offset().top - 50}, 500);
$.getJSON(results_url, params, function(data) {
if (data.success) {
$('.page-body').html(data.results);
$loader.hide();
}
});
$.getJSON(filters_url, params, function (data) {
if (data.success){
$('#filter_form_wraper').html(data.form);
set_filter_block_height();
build_filters_period();
}
})
}
$(document).ready(function () { $(document).ready(function () {
set_filter_block_height(); set_filter_block_height();
$('#filter_form_wraper').on('click', '.show_more_link', function(e){ $('#filter_form_wraper')
.on('click', '.show_more_link', function(e){
e.preventDefault(); e.preventDefault();
var $block = $(this).parents('.filter_block'), var $block = $(this).parents('.filter_block'),
li_length = $block.find('li').length, li_length = $block.find('li').length,
@ -4964,15 +5024,13 @@ $(document).ready(function () {
} }
} }
}) })
.on('click', '.show_all_link', function(e){
$('#filter_form_wraper').on('click', '.show_all_link', function(e){
e.preventDefault(); e.preventDefault();
var $block = $(this).parents('.filter_block'); var $block = $(this).parents('.filter_block');
$block.find('li').fadeIn(200); $block.find('li').fadeIn(200);
$block.find('.links_block').hide(); $block.find('.links_block').hide();
}) })
.on('click', '#get_filters', function(event) {
$('#filter_form_wraper').on('click', '#get_filters', function(event) {
event.preventDefault(); event.preventDefault();
var search_string = '', var search_string = '',
$link = $(this); $link = $(this);
@ -5004,9 +5062,15 @@ $(document).ready(function () {
if (data.success) { if (data.success) {
$('#filter_form_wraper').html(data.form); $('#filter_form_wraper').html(data.form);
set_filter_block_height(); set_filter_block_height();
build_filters_period();
} }
}); });
})
.on('click', '#filter_period_trigger', function (event) {
event.preventDefault();
// $('#pwPeriod').fadeIn();
$.fancybox.open('#filterPeriod')
}); });
$('#get_filters').trigger('click'); $('#get_filters').trigger('click');
@ -5032,90 +5096,15 @@ $(document).ready(function () {
}); });
$('body').on('click', '#clearPeriod', function (event) {
event.preventDefault();
//$('ul.about_block_menu li.m_01').click(function () { $('#filter_form_wraper #id_date_from input').val('');
// $(this).parents('ul').find('li').removeClass('active'); $('#filter_form_wraper #id_date_to input').val('');
//$(this).addClass('active');
//$(this).parents('ul').removeClass('about_active'); $.fancybox.close();
//$('div.about_block').removeClass('about_show'); submit_search_form();
//$('div.team_about_block').addClass('about_show'); })
//$('div.parnters_about_block').removeClass('about_show');
//$('div.contacts_about_block').removeClass('about_show');
//$('div.review_about_block').removeClass('about_show');
//
//$('div.team_about_block_text').addClass('about_show');
//$('div.parnters_about_block_text').removeClass('about_show');
//$('div.contacts_about_block_text').removeClass('about_show');
//$('div.review_about_block_text').removeClass('about_show');
// return false;
//});
//
//$('ul.about_block_menu li.m_02').click(function () {
// $(this).parents('ul').find('li').removeClass('active');
//$(this).addClass('active');
//$(this).parents('ul').removeClass('about_active');
//$('div.about_block').removeClass('about_show');
//$('div.team_about_block').removeClass('about_show');
//$('div.parnters_about_block').addClass('about_show');
//$('div.contacts_about_block').removeClass('about_show');
//$('div.review_about_block').removeClass('about_show');
//
//$('div.team_about_block_text').removeClass('about_show');
//$('div.parnters_about_block_text').addClass('about_show');
//$('div.contacts_about_block_text').removeClass('about_show');
//$('div.review_about_block_text').removeClass('about_show');
// return false;
//});
//
//$('ul.about_block_menu li.m_03').click(function () {
// $(this).parents('ul').find('li').removeClass('active');
//$(this).addClass('active');
//$(this).parents('ul').removeClass('about_active');
//$('div.about_block').removeClass('about_show');
//$('div.team_about_block').removeClass('about_show');
//$('div.parnters_about_block').removeClass('about_show');
//$('div.contacts_about_block').addClass('about_show');
//$('div.review_about_block').removeClass('about_show');
//
//$('div.team_about_block_text').removeClass('about_show');
//$('div.parnters_about_block_text').removeClass('about_show');
//$('div.contacts_about_block_text').addClass('about_show');
//$('div.review_about_block_text').removeClass('about_show');
// return false;
//});
//
//$('ul.about_block_menu li.m_04').click(function () {
// $(this).parents('ul').find('li').removeClass('active');
//$(this).addClass('active');
//$(this).parents('ul').removeClass('about_active');
//$('div.about_block').removeClass('about_show');
//$('div.team_about_block').removeClass('about_show');
//$('div.parnters_about_block').removeClass('about_show');
//$('div.contacts_about_block').removeClass('about_show');
//$('div.review_about_block').addClass('about_show');
//
//$('div.team_about_block_text').removeClass('about_show');
//$('div.parnters_about_block_text').removeClass('about_show');
//$('div.contacts_about_block_text').removeClass('about_show');
//$('div.review_about_block_text').addClass('about_show');
// return false;
//});
//
//$('ul.about_block_menu li.m_05').click(function () {
// $(this).parents('ul').find('li').removeClass('active');
//$(this).parents('ul').addClass('about_active');
//$('div.about_block').addClass('about_show');
//$('div.team_about_block').removeClass('about_show');
//$('div.parnters_about_block').removeClass('about_show');
//$('div.contacts_about_block').removeClass('about_show');
//$('div.review_about_block').removeClass('about_show');
//
//$('div.team_about_block_text').removeClass('about_show');
//$('div.parnters_about_block_text').removeClass('about_show');
//$('div.contacts_about_block_text').removeClass('about_show');
//$('div.review_about_block_text').removeClass('about_show');
// return false;
//});
$('#filter_form_wraper').on('click', '.filter_block_label', function(event) { $('#filter_form_wraper').on('click', '.filter_block_label', function(event) {
@ -5129,43 +5118,7 @@ $(document).ready(function () {
$('#filter_form_wraper').on('change', 'input[type="checkbox"]', function(event) { $('#filter_form_wraper').on('change', 'input[type="checkbox"]', function(event) {
event.preventDefault(); event.preventDefault();
var $form = $('.filter_form'), submit_search_form();
params = $form.serialize(),
filters_url = $form.data('formurl'),
results_url = $form.data('resultsurl'),
$loader = $('#wait-ajax');
// form_done = false,
// results_done = false;
$loader.show();
$('html, body').animate({scrollTop: $('.page-body').offset().top - 50}, 500);
$.getJSON(results_url, params, function(data) {
if (data.success) {
//results_done = true;
$('.page-body').html(data.results);
// if (results_done && form_done){
// $loader.hide();
// }
$loader.hide();
}
});
$.getJSON(filters_url, params, function (data) {
if (data.success){
//form_done = true;
$('#filter_form_wraper').html(data.form);
set_filter_block_height();
// if (results_done && form_done){
// $loader.hide();
// }
}
})
}); });

16
static/client/js_min/vendor.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
templates/client/includes/events/filter_form.html
Unescape View File

@ -29,7 +29,9 @@
{{ field.errors }} {{ field.errors }}
{% endfor %} {% endfor %}
{{ form.get_dates }} <a href="#" class="filter_period_trigger" id="filter_period_trigger">{{ form.get_dates }}</a>
{# <button type="submit">{% trans "Применить" %}</button> #} {# <button type="submit">{% trans "Применить" %}</button> #}
</div> </div>
{% include 'client/popups/filter_period.html' %}
</form> </form>

37
templates/client/popups/filter_period.html
Unescape View File

@ -0,0 +1,37 @@
{% load i18n %}
<div id="filterPeriod" class="popup-window filterPeriod">
<header class="clearfix">
<div class="pw-title">{% trans 'Период' %}</div>
</header>
<div class="pw-body clearfix">
<div class="pw-form search_form" >
<div class="pwf-line period">
<div class="pwf-field ">
<label>{% trans 'с' %}</label>
<input class="date" id="filterDateFrom" name="from" placeholder="дд.мм.гггг" type="text">
<script>
$('#filterDateFrom').datepicker({
dateFormat: 'dd.mm.yy',
showOn: 'focus'
});
</script>
</div>
<div class="pwf-field ">
<label>{% trans 'по' %}</label>
<input class="date" id="filterDateTo" name="to" placeholder="дд.мм.гггг" type="text">
<script>
$('#filterDateTo').datepicker({
dateFormat: 'dd.mm.yy',
showOn: 'focus'
});
</script>
</div>
</div>
<div class="pwf-buttons-line">
<button class="icon-check modal-approve" id="periodFilterButton">{% trans 'Искать' %}</button>
<button class="modal-approve" id="clearPeriod">{% trans 'Сбросить период' %}</button>
</div>
</div>
</div>
</div>
Write Preview
Loading…
Cancel
Save