1461: Этап №5: Фильтрация событий

изменения фронтенда для фильтрации

events/forms.py

@@ -202,6 +202,7 @@ class FilterForm(forms.Form):
                 self._related_fields.append('tag')
                 self._lookup_kwargs['tag__in'] = d.get('tag')
             if d.get('country'):
+                self._related_fields.append('country')
                 self._lookup_kwargs['country_id__in'] = d.get('country')
             if d.get('city'):
                 self._related_fields.append('city')
@@ -263,7 +264,7 @@ class FilterForm(forms.Form):
                 qs.query.having.add(ExtraWhere(having, [], OR), AND)
             qs = qs.values(*values).order_by(*order_by)
             self.fields[field].queryset = qs
-            # print(self.fields[field].queryset.query)
+            print(self.fields[field].queryset.query)
 
         for field in ['members', 'visitors', 'price']:
             self.fields[field].choices = self.make_local_field_count(field) or self.fields[field].choices

package.json

@@ -8,19 +8,20 @@
   },
   "devDependencies": {
     "connect": "~3.4.0",
+    "gulp": "^3.9.1",
+    "gulp-autoprefixer": "~3.0.2",
+    "gulp-cli": "^1.2.2",
     "gulp-concat": "~2.6.0",
-    "gulp-livereload": "~3.8.1",
+    "gulp-cssmin": "~0.1.7",
-    "gulp": "~3.9.0",
-    "gulp-stylus": "~2.1.0",
-    "gulp-uglify": "~1.4.1",
-    "gulp-jade": "~1.1.0",
-    "gulp-imagemin": "~2.3.0",
     "gulp-csso": "~1.0.0",
+    "gulp-imagemin": "~2.3.0",
+    "gulp-jade": "~1.1.0",
+    "gulp-livereload": "~3.8.1",
     "gulp-myth": "~1.0.3",
+    "gulp-newer": "~0.5.1",
     "gulp-rename": "~1.2.2",
-    "gulp-autoprefixer": "~3.0.2",
+    "gulp-stylus": "~2.1.0",
-    "gulp-cssmin": "~0.1.7",
+    "gulp-uglify": "~1.4.1"
-    "gulp-newer": "~0.5.1"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

static/client/js/scripts.js

@@ -95,7 +95,7 @@ $(document).ready(function () {
 		$this.find('.fa').toggleClass('fa-caret-down fa-caret-up');
 	});
 
-    $('.filter_form').on('change', 'input[type="checkbox"]', function(event) {
+    $('#filter_form_wraper').on('change', 'input[type="checkbox"]', function(event) {
         event.preventDefault();
         var $form = $('.filter_form'),
             params = $form.serialize(),
@@ -109,13 +109,16 @@ $(document).ready(function () {
             data: $form.serialize(),
         })
         .done(function(data) {
-            $('.page-body').html(data);
+            if (data.success) {
-            $loader.hide();
+              $('.page-body').html(data.results);
+              $('#filter_form_wraper').html(data.form);
+              $loader.hide();
+            }
         })
 
     });
 
-    $('.filter_form_clear_all').on('click', function(event) {
+    $('#filter_form_wraper').on('click', '.filter_form_clear_all', function(event) {
         event.preventDefault();
 
         $('.filter_form input').prop('checked', false);

static/client/js/vendor.js

@@ -5012,7 +5012,7 @@ $(document).ready(function () {
 		$this.find('.fa').toggleClass('fa-caret-down fa-caret-up');
 	});
 
-    $('.filter_form').on('change', 'input[type="checkbox"]', function(event) {
+    $('#filter_form_wraper').on('change', 'input[type="checkbox"]', function(event) {
         event.preventDefault();
         var $form = $('.filter_form'),
             params = $form.serialize(),
@@ -5026,13 +5026,16 @@ $(document).ready(function () {
             data: $form.serialize(),
         })
         .done(function(data) {
-            $('.page-body').html(data);
+            if (data.success) {
-            $loader.hide();
+              $('.page-body').html('appended' + data.results);
+              $('#filter_form_wraper').html('appended' + data.form);
+              $loader.hide();
+            }
         })
 
     });
 
-    $('.filter_form_clear_all').on('click', function(event) {
+    $('#filter_form_wraper').on('click', '.filter_form_clear_all', function(event) {
         event.preventDefault();
 
         $('.filter_form input').prop('checked', false);

templates/client/base_catalog.html

@@ -20,7 +20,9 @@
                     {# {% include 'client/includes/online_consult.html' %} #}
 
                     {% if filtering == True %}
-                        {% include 'client/includes/events/filter_form.html' %}
+                        <div id="filter_form_wraper">
+                            {% include 'client/includes/events/filter_form.html' %}
+                        </div>
                     {% endif %}
                     
                     {% include 'client/includes/banners/aside_1.html' %}