Merge branch 'stage8' of gitlab.com:OldminTeam/expomap into stage8

.dockerignore

@@ -1,3 +1,4 @@
 data
 media
 collected_static
+node_modules

Dockerfile

@@ -30,6 +30,8 @@ RUN apt-get update \
     \
     && rm -rf /var/lib/apt/lists/* \
     \
+    && npm install -g gulp \
+    \
     && npm install
 RUN sed -i -e 's/# ru_RU.UTF-8 UTF-8/ru_RU.UTF-8 UTF-8/' /etc/locale.gen && \
     echo 'LANG="ru_RU.UTF-8"'>/etc/default/locale && \

apps/city/models.py

@@ -63,9 +63,9 @@ class City(TranslatableModel):
 
     def get_hotels(self):
         """
-        returns list of 5 hotels in current city
+        returns list of 4 hotels in current city
         """
-        return list(self.hotels.all()[:5])
+        return list(self.hotels.all()[:4])
 
     def get_events(self):
         """

apps/expobanner/views.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import json
 import re
+from datetime import date
 
 from django.http import HttpResponse
 from django.shortcuts import redirect, get_object_or_404, render
@@ -100,8 +101,8 @@ def get_top(request):
               'catalog': catalog,
               'month': request.GET.get('month')}
 
-    tops = Top.cached.all()
-    events = get_top_events(tops, params, request)
+    tops = Top.cached.filter(fr__lte=date.today(), to__gte=date.today()).order_by('?')
+    events = get_top_events(tops, params, request)[:3]
     ctx = {'objects': events}
 
     if not events:

apps/place_exposition/models.py

@@ -206,7 +206,7 @@ class PlaceExposition(TranslatableModel, ExpoMixin):
         # coordinate current place
         place_coord = (float(self.address['lat']), float(self.address['lng']))
         # 4 coordinates of 4 nearest hotels
-        hotels_coord = sorted(hotels_coord, key=partial(dist, place_coord))[:5]
+        hotels_coord = sorted(hotels_coord, key=partial(dist, place_coord))[:4]
         # start generating filter for queryset
         qs = [Q(latitude=item[0]) & Q(longitude=item[1]) for item in hotels_coord]
         res = reduce(lambda a,b: a|b, qs)

docker-compose.yml

@@ -34,7 +34,7 @@ services:
       - MYSQL_ROOT_PASSWORD=root
       - MYSQL_DATABASE=expomap
     ports:
-      - "3306:3306"
+      - "3305:3306"
     volumes:
       - ./data/mysql/db:/var/lib/mysql
 

static/client/css/main.css

@@ -5934,6 +5934,18 @@ dl.add-info dd ul li {
 .h-booking a.more {
     font-size: 11px
 }
+
+.h-booking ul.flexing_for_one_row {
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-justify-content: space-around;
+        -ms-flex-pack: distribute;
+            justify-content: space-around;
+}
+
 .h-booking ul {
     margin: 0;
     padding: 0 0 0 4px;
@@ -14798,9 +14810,10 @@ h1 .preview_toggle:hover{
     float: none;
 }
 
-.exposition_booking_block .h-booking ul li:last-child {
-    margin-right: 0;
-}
+/*Hotels: 4 items for row*/
+/*.exposition_booking_block .h-booking ul li:last-child {*/
+    /*margin-right: 0;*/
+/*}*/
 
 .exposition_booking_block .h-booking .sect-title a {
     color: #40bbea;
@@ -14853,4 +14866,4 @@ h1 .preview_toggle:hover{
 .exposition_nearest .sect-title {
     font-size: 23px;
     font-weight: 500;
-}
+}

static/client/js/rejs/tops.js

@@ -79,9 +79,9 @@
 
         if (parent) {
             parent.innerHTML = text;
-            $(document).ready(function () {
-                removeDublicates();
-            });
+            // $(document).ready(function () {
+            //     removeDublicates();
+            // });
         }
     };
 

static/client/js/scripts.js

@@ -88,6 +88,7 @@ function build_filters_period () {
 function submit_search_form () {
     var $form = $('.filter_form'),
         params = $form.serialize(),
+        paramsForTop = $form.serializeArray(),
         filters_url = $form.data('formurl'),
         results_url = $form.data('resultsurl'),
         $loader = $('#wait-ajax');
@@ -101,7 +102,7 @@ function submit_search_form () {
     $.getJSON(results_url, params, function(data) {
         if (data.success) {
 
-            $('.page-body').html(data.results);
+            $('.page-body').html(data.results).prepend('<div id="expo_top_events"></div>');
             build_sidebar();
             $loader.hide();
         }
@@ -115,6 +116,105 @@ function submit_search_form () {
             build_filters_period();
         }
     })
+
+    var API_URL_ROOT = "/expo-b/get-tops/";
+    var PARENT_ID = "expo_top_events";
+
+    var getUrl = function () {
+        var search = [];
+
+        var parts = /^\/([^\/]+)(?:\/|$)/i.exec(location.pathname);
+        if (parts) {
+            search.push("catalog=" + encodeURIComponent(parts[1]));
+        } else {
+            search.push("catalog=");
+        }
+
+        var data = window.sendData, theme = [];
+        $.each(paramsForTop, function(i,val){
+          if(val.name === 'theme') {
+            theme.push(parseInt(val.value));
+          }
+        });
+        data.theme = theme;
+        console.log('NEW:',data);
+        if (data instanceof Object) {
+            for (var key in data) {
+                if (data.hasOwnProperty(key)) {
+                    var value = data[key];
+
+                    if (value instanceof Array) {
+                        for (var i = 0, l = value.length; i < l; i++) {
+                            search.push(encodeURIComponent(key) + "=" + encodeURIComponent(value[i]));
+                        }
+                    } else {
+                        search.push(encodeURIComponent(key) + "=" + encodeURIComponent(value));
+                    }
+                }
+            }
+        }
+
+        return API_URL_ROOT + "?" + search.join("&");
+    };
+
+    var runCallback = function (callback, arg) {
+        try {
+            callback(arg);
+        } catch (error) {
+            // do nothing
+        }
+        // console.info('callback Done');
+    };
+
+    var getTops = function (url, callback) {
+        var xhr = new XMLHttpRequest();
+        xhr.open("GET", url, true);
+
+        xhr.onreadystatechange = function (event) {
+            if (event.target.readyState === 4) {
+                if (event.target.status === 200) {
+                    if (document.readyState === "loading" && !window.marker_DOMtopjsElementInserted) {
+                        // console.info('setting DOMContentLoaded event listener');
+                        // console.info('setting DOMtopjsElementInserted event listener');
+                        // document.addEventListener("DOMContentLoaded", function() {
+
+                        document.addEventListener("DOMtopjsElementInserted", function() {
+                            runCallback(callback, event.target.responseText);
+                        });
+                    } else {
+                        runCallback(callback, event.target.responseText);
+                    }
+                }
+            }
+        };
+
+        xhr.send();
+    };
+
+    var removeDublicates = function () {
+        $('div#' + PARENT_ID + ' ul li.cl-item').each(function(index, el) {
+            $('div.page-body ul.cat-list li.cl-item[data-slug=\'' + $(el).data('slug') + '\']').not(el).remove();
+        });
+    };
+
+    var insertTops = function (text) {
+        var parent = document.getElementById(PARENT_ID);
+
+        if (parent) {
+            parent.innerHTML = text;
+            // $(document).ready(function () {
+            //     removeDublicates();
+            // });
+        }
+    };
+
+    var main = function () {
+        getTops(getUrl(), insertTops);
+    };
+    // main();
+    // window.addEventListener("load", main);
+    // document.addEventListener("DOMContentLoaded", main);
+    main();
 }
 
 $(document).ready(function () {

static/client/js/vendor.js

@@ -4947,6 +4947,7 @@ function build_filters_period () {
 function submit_search_form () {
     var $form = $('.filter_form'),
         params = $form.serialize(),
+        paramsForTop = $form.serializeArray(),
         filters_url = $form.data('formurl'),
         results_url = $form.data('resultsurl'),
         $loader = $('#wait-ajax');
@@ -4960,7 +4961,7 @@ function submit_search_form () {
     $.getJSON(results_url, params, function(data) {
         if (data.success) {
 
-            $('.page-body').html(data.results);
+            $('.page-body').html(data.results).prepend('<div id="expo_top_events"></div>');
             build_sidebar();
             $loader.hide();
         }
@@ -4974,6 +4975,105 @@ function submit_search_form () {
             build_filters_period();
         }
     })
+
+    var API_URL_ROOT = "/expo-b/get-tops/";
+    var PARENT_ID = "expo_top_events";
+
+    var getUrl = function () {
+        var search = [];
+
+        var parts = /^\/([^\/]+)(?:\/|$)/i.exec(location.pathname);
+        if (parts) {
+            search.push("catalog=" + encodeURIComponent(parts[1]));
+        } else {
+            search.push("catalog=");
+        }
+
+        var data = window.sendData, theme = [];
+        $.each(paramsForTop, function(i,val){
+          if(val.name === 'theme') {
+            theme.push(parseInt(val.value));
+          }
+        });
+        data.theme = theme;
+        console.log('NEW:',data);
+        if (data instanceof Object) {
+            for (var key in data) {
+                if (data.hasOwnProperty(key)) {
+                    var value = data[key];
+
+                    if (value instanceof Array) {
+                        for (var i = 0, l = value.length; i < l; i++) {
+                            search.push(encodeURIComponent(key) + "=" + encodeURIComponent(value[i]));
+                        }
+                    } else {
+                        search.push(encodeURIComponent(key) + "=" + encodeURIComponent(value));
+                    }
+                }
+            }
+        }
+
+        return API_URL_ROOT + "?" + search.join("&");
+    };
+
+    var runCallback = function (callback, arg) {
+        try {
+            callback(arg);
+        } catch (error) {
+            // do nothing
+        }
+        // console.info('callback Done');
+    };
+
+    var getTops = function (url, callback) {
+        var xhr = new XMLHttpRequest();
+        xhr.open("GET", url, true);
+
+        xhr.onreadystatechange = function (event) {
+            if (event.target.readyState === 4) {
+                if (event.target.status === 200) {
+                    if (document.readyState === "loading" && !window.marker_DOMtopjsElementInserted) {
+                        // console.info('setting DOMContentLoaded event listener');
+                        // console.info('setting DOMtopjsElementInserted event listener');
+                        // document.addEventListener("DOMContentLoaded", function() {
+
+                        document.addEventListener("DOMtopjsElementInserted", function() {
+                            runCallback(callback, event.target.responseText);
+                        });
+                    } else {
+                        runCallback(callback, event.target.responseText);
+                    }
+                }
+            }
+        };
+
+        xhr.send();
+    };
+
+    var removeDublicates = function () {
+        $('div#' + PARENT_ID + ' ul li.cl-item').each(function(index, el) {
+            $('div.page-body ul.cat-list li.cl-item[data-slug=\'' + $(el).data('slug') + '\']').not(el).remove();
+        });
+    };
+
+    var insertTops = function (text) {
+        var parent = document.getElementById(PARENT_ID);
+
+        if (parent) {
+            parent.innerHTML = text;
+            // $(document).ready(function () {
+            //     removeDublicates();
+            // });
+        }
+    };
+
+    var main = function () {
+        getTops(getUrl(), insertTops);
+    };
+    // main();
+    // window.addEventListener("load", main);
+    // document.addEventListener("DOMContentLoaded", main);
+    main();
 }
 
 $(document).ready(function () {

templates/client/includes/booking_block.html

@@ -8,7 +8,7 @@
         </div>
         <a class="more blue2" target="_blank" href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ city.id }}{% if event %}&checkin_monthday={{ event.data_begin|date:'j' }}&checkin_year_month={{ event.data_begin|date:'Y' }}-{{ event.data_begin|date:'n' }}&checkout_monthday={{ event.data_end|date:'j' }}&checkout_year_month={{ event.data_end|date:'Y' }}-{{ event.data_end|date:'n' }}{% endif %}">{% trans 'Все отели поблизости' %}</a>
     </header>
-        <ul>
+        <ul class="flexing_for_one_row">
         {% if place %}
             {% for hotel in place.get_nearest_hotels %}
             <li>