Task 162

functions/form_check.py

@@ -15,12 +15,9 @@ def is_positive_integer(data,
     else:
         raise ValidationError(msg)
 
-
-from slugify import slugify
-
+from django.utils.encoding import smart_str, smart_unicode
+import unicodedata
 def translit_with_separator(string, separator='-'):
-
-    #return slugify(string)
     """
     Trsanslit string and replace "bad" symbols for separator
 
@@ -30,15 +27,13 @@ def translit_with_separator(string, separator='-'):
 
     #make string unicode
     string = string.strip()
-    string = u'%s'%string
+    string = smart_unicode(string)
 
     #make string translit
     try:
         st = pytils.translit.translify(string)
     except ValueError:
-        # remove exception symbs(hack)
-        string = string.replace(u'\u200e', '')
-        string = string.replace(u'\u200b', '')
+        string = unicodedata.normalize('NFKD', string).encode('ascii','ignore')
         st = pytils.translit.translify(string)
 
     #replace "bad" symbols for '-'symbol
@@ -54,7 +49,6 @@ def translit_with_separator(string, separator='-'):
     return st.lower()
 
 
-
 def is_latin_char(uchr):
     latin_letters= {}
     try: return latin_letters[uchr]

settings/templatetags/template_filters.py

@@ -141,8 +141,10 @@ def timesince_exp(value, date=None):
     """
     delta = timedelta(days=28)
     d = date -value
-    if d>delta:
-        return True
+
+    if d > delta:
+        if date.month== value.month:
+            return True
     return False
 
 @register.filter

static/custom_js/main.js

@@ -88,7 +88,8 @@ function postTimetable(data, textStatus){
 
 function postStat(data, textStatus){
         if(data.success){
-            location.reload;
+
+            window.location.reload();
         }
         else{
             $.each(data.errors, function(field_name, errors){
@@ -424,7 +425,6 @@ $(document).ready(function(){
     $('#stat_form').on('submit', function(e){//submit(function(){
         e.preventDefault();
         var url = '/admin/ajax_post_stat/' + $('#obj_id').val() + '/';
-        console.log(url)
         var formData = $(this).serialize();
 
         $.ajax({

templates/client/includes/exposition/exposition_object.html

@@ -73,7 +73,6 @@
                             </div>
                         </header>
                     </div>
-\1
 				{% endif %}
 				<hr />
 				<div class="i-buttons clearfix">

templates/client/includes/exposition/price.html

@@ -129,7 +129,7 @@
                                             <li>
                                                 <div class="prl-value">{{ exposition.price_day_bar }} {% if exposition.price_day_bar|isdigit %}{{ exposition.get_currency_html }}{% endif %}</div>
 
-                                                <div class="prl-descr"><span>на 1 день</span></div>
+                                                <div class="prl-descr"><span>{% trans 'на 1 день' %}</span></div>
                                             </li>
                                             {% endif %}
                                             {% if exposition.price_all_bar %}
@@ -177,14 +177,14 @@
 
                         <div class="epr-subtitle">{% trans 'Стоимость аренды 1м²' %}</div>
 
-                        {% if exposition.max_closed_equipped_area or exposition.max_closed_area or exposition.max_open_area %}
+                        {% if exposition.max_closed_equipped_area or exposition.max_closed_area or exposition.max_open_area or exposition.min_closed_area %}
                             <ul class="pr-list">
-                                {% if exposition.max_closed_equipped_area %}
+                                {% if exposition.max_closed_equipped_area or exposition.min_closed_equipped_area %}
                                 <li>
 
                                     <div class="prl-value">
                                         {% if exposition.min_closed_equipped_area %}
-                                            {{ exposition.min_closed_equipped_area }}-{{ exposition.max_closed_equipped_area }} {{ exposition.get_currency_html }}
+                                            {{ exposition.min_closed_equipped_area }}{% if exposition.min_closed_equipped_area %}-{{ exposition.max_closed_equipped_area }}{% endif %} {{ exposition.get_currency_html }}
                                         {% else %}
                                             {{ exposition.max_closed_equipped_area }} {{ exposition.get_currency_html }}
                                         {% endif %}
@@ -193,11 +193,11 @@
                                 </li>
                                 {% endif %}
 
-                                {% if exposition.max_closed_area %}
+                                {% if exposition.max_closed_area or exposition.min_closed_area %}
                                 <li>
                                     <div class="prl-value">
                                         {% if exposition.min_closed_area %}
-                                            {{ exposition.min_closed_area }}-{{ exposition.max_closed_area }} {{ exposition.get_currency_html }}
+                                            {{ exposition.min_closed_area }}{% if exposition.max_closed_area %}-{{ exposition.max_closed_area }}{% endif %} {{ exposition.get_currency_html }}
                                         {% else %}
                                             {{ exposition.max_closed_area }} {{ exposition.get_currency_html }}
                                         {% endif %}
@@ -206,11 +206,11 @@
                                 </li>
                                 {% endif %}
 
-                                {% if exposition.max_open_area %}
+                                {% if exposition.max_open_area or exposition.min_open_area %}
                                 <li>
                                     <div class="prl-value">
                                         {% if exposition.min_open_area %}
-                                            {{ exposition.min_open_area }}-{{ exposition.max_open_area }} {{ exposition.get_currency_html }}
+                                            {{ exposition.min_open_area }}{% if exposition.max_open_area  %}-{{ exposition.max_open_area }}{% endif %} {{ exposition.get_currency_html }}
                                         {% else %}
                                             {{ exposition.max_open_area }} {{ exposition.get_currency_html }}
                                         {% endif %}